[x86] Disable USB_SN9C102; this driver is deprecated in favour of the gspca drivers
While we're doing this, move all the staging/media driver disables into debian/config/kernelarch-x86/config as STAGING_MEDIA is only enabled on x86. svn path=/dists/sid/linux/; revision=21811
This commit is contained in:
parent
a371875c1b
commit
dfb5e384b3
|
@ -45,6 +45,8 @@ linux (3.16.2-3) UNRELEASED; urgency=medium
|
||||||
SAMSUNG_Q10, INTEL_RST, INTEL_SMARTCONNECT, PVPANIC as modules
|
SAMSUNG_Q10, INTEL_RST, INTEL_SMARTCONNECT, PVPANIC as modules
|
||||||
* [x86] sony-laptop: Enable SONYPI_COMPAT
|
* [x86] sony-laptop: Enable SONYPI_COMPAT
|
||||||
* [x86,ia64] firmware: Enable DMI_SYSFS
|
* [x86,ia64] firmware: Enable DMI_SYSFS
|
||||||
|
* [x86] Disable USB_SN9C102; this driver is deprecated in favour of the
|
||||||
|
gspca drivers
|
||||||
* [i386] usb/gadget: Enable USB_AMD5536UDC as module
|
* [i386] usb/gadget: Enable USB_AMD5536UDC as module
|
||||||
* [i386] comedi: Enable COMEDI_AMPLC_DIO200_ISA, COMEDI_AMPLC_PC236_ISA,
|
* [i386] comedi: Enable COMEDI_AMPLC_DIO200_ISA, COMEDI_AMPLC_PC236_ISA,
|
||||||
COMEDI_AMPLC_PC263_ISA, COMEDI_DAS08_ISA, COMEDI_NI_LABPC_ISA as modules
|
COMEDI_AMPLC_PC263_ISA, COMEDI_DAS08_ISA, COMEDI_NI_LABPC_ISA as modules
|
||||||
|
|
|
@ -3721,21 +3721,6 @@ CONFIG_STAGING=y
|
||||||
##
|
##
|
||||||
# CONFIG_STAGING_MEDIA is not set
|
# CONFIG_STAGING_MEDIA is not set
|
||||||
|
|
||||||
##
|
|
||||||
## file: drivers/staging/media/bcm2048/Kconfig
|
|
||||||
##
|
|
||||||
# CONFIG_I2C_BCM2048 is not set
|
|
||||||
|
|
||||||
##
|
|
||||||
## file: drivers/staging/media/omap24xx/Kconfig
|
|
||||||
##
|
|
||||||
# CONFIG_VIDEO_TCM825X is not set
|
|
||||||
|
|
||||||
##
|
|
||||||
## file: drivers/staging/media/sn9c102/Kconfig
|
|
||||||
##
|
|
||||||
CONFIG_USB_SN9C102=m
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/staging/mt29f_spinand/Kconfig
|
## file: drivers/staging/mt29f_spinand/Kconfig
|
||||||
##
|
##
|
||||||
|
|
|
@ -1443,6 +1443,11 @@ CONFIG_STAGING_MEDIA=y
|
||||||
##
|
##
|
||||||
CONFIG_DVB_AS102=m
|
CONFIG_DVB_AS102=m
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: drivers/staging/media/bcm2048/Kconfig
|
||||||
|
##
|
||||||
|
# CONFIG_I2C_BCM2048 is not set
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/staging/media/go7007/Kconfig
|
## file: drivers/staging/media/go7007/Kconfig
|
||||||
##
|
##
|
||||||
|
@ -1467,11 +1472,21 @@ CONFIG_LIRC_ZILOG=m
|
||||||
CONFIG_USB_MSI3101=m
|
CONFIG_USB_MSI3101=m
|
||||||
CONFIG_MEDIA_TUNER_MSI001=m
|
CONFIG_MEDIA_TUNER_MSI001=m
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: drivers/staging/media/omap24xx/Kconfig
|
||||||
|
##
|
||||||
|
# CONFIG_VIDEO_TCM825X is not set
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/staging/media/rtl2832u_sdr/Kconfig
|
## file: drivers/staging/media/rtl2832u_sdr/Kconfig
|
||||||
##
|
##
|
||||||
CONFIG_DVB_RTL2832_SDR=m
|
CONFIG_DVB_RTL2832_SDR=m
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: drivers/staging/media/sn9c102/Kconfig
|
||||||
|
##
|
||||||
|
# CONFIG_USB_SN9C102 is not set
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/staging/media/solo6x10/Kconfig
|
## file: drivers/staging/media/solo6x10/Kconfig
|
||||||
##
|
##
|
||||||
|
|
Loading…
Reference in New Issue