Limit CONFIG_STAGING_MEDIA to x86
svn path=/dists/trunk/linux-2.6/; revision=18515
This commit is contained in:
parent
ecc79383cf
commit
024d6df30e
|
@ -13,7 +13,7 @@ linux-2.6 (3.2.1-1~experimental.1) UNRELEASED; urgency=low
|
|||
* Install /lib/modules/<kernel-version>/modules.builtin in linux-image
|
||||
packages
|
||||
* [ia64] Add accept4() syscall (Closes: #647825)
|
||||
* staging: Enable STAGING_MEDIA, which various drivers now depend on
|
||||
* [x86] staging: Enable STAGING_MEDIA, which various drivers now depend on
|
||||
(Closes: #654800)
|
||||
|
||||
[ Bastian Blank ]
|
||||
|
|
|
@ -2786,12 +2786,7 @@ CONFIG_STAGING=y
|
|||
##
|
||||
## file: drivers/staging/media/Kconfig
|
||||
##
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
|
||||
##
|
||||
## file: drivers/staging/media/go7007/Kconfig
|
||||
##
|
||||
# CONFIG_VIDEO_GO7007 is not set
|
||||
# CONFIG_STAGING_MEDIA is not set
|
||||
|
||||
##
|
||||
## file: drivers/staging/panel/Kconfig
|
||||
|
|
|
@ -1307,11 +1307,21 @@ CONFIG_HYPERV_STORAGE=m
|
|||
CONFIG_HYPERV_NET=m
|
||||
CONFIG_HYPERV_MOUSE=m
|
||||
|
||||
##
|
||||
## file: drivers/staging/media/Kconfig
|
||||
##
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
|
||||
##
|
||||
## file: drivers/staging/media/easycap/Kconfig
|
||||
##
|
||||
CONFIG_EASYCAP=m
|
||||
|
||||
##
|
||||
## file: drivers/staging/media/go7007/Kconfig
|
||||
##
|
||||
# CONFIG_VIDEO_GO7007 is not set
|
||||
|
||||
##
|
||||
## file: drivers/staging/media/lirc/Kconfig
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue