[kernel] r21811 - in dists/sid/linux/debian: . config config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Fri Sep 12 05:29:24 2014
New Revision: 21811

Log:
[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.

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/config
   dists/sid/linux/debian/config/kernelarch-x86/config

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Sep 12 05:25:26 2014	(r21810)
+++ dists/sid/linux/debian/changelog	Fri Sep 12 05:29:24 2014	(r21811)
@@ -45,6 +45,8 @@
     SAMSUNG_Q10, INTEL_RST, INTEL_SMARTCONNECT, PVPANIC as modules
   * [x86] sony-laptop: Enable SONYPI_COMPAT
   * [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] comedi: Enable COMEDI_AMPLC_DIO200_ISA, COMEDI_AMPLC_PC236_ISA,
     COMEDI_AMPLC_PC263_ISA, COMEDI_DAS08_ISA, COMEDI_NI_LABPC_ISA as modules

Modified: dists/sid/linux/debian/config/config
==============================================================================
--- dists/sid/linux/debian/config/config	Fri Sep 12 05:25:26 2014	(r21810)
+++ dists/sid/linux/debian/config/config	Fri Sep 12 05:29:24 2014	(r21811)
@@ -3722,21 +3722,6 @@
 # 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
 ##
 # CONFIG_MTD_SPINAND_MT29F is not set

Modified: dists/sid/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-x86/config	Fri Sep 12 05:25:26 2014	(r21810)
+++ dists/sid/linux/debian/config/kernelarch-x86/config	Fri Sep 12 05:29:24 2014	(r21811)
@@ -1444,6 +1444,11 @@
 CONFIG_DVB_AS102=m
 
 ##
+## file: drivers/staging/media/bcm2048/Kconfig
+##
+# CONFIG_I2C_BCM2048 is not set
+
+##
 ## file: drivers/staging/media/go7007/Kconfig
 ##
 # CONFIG_VIDEO_GO7007 is not set
@@ -1468,11 +1473,21 @@
 CONFIG_MEDIA_TUNER_MSI001=m
 
 ##
+## file: drivers/staging/media/omap24xx/Kconfig
+##
+# CONFIG_VIDEO_TCM825X is not set
+
+##
 ## file: drivers/staging/media/rtl2832u_sdr/Kconfig
 ##
 CONFIG_DVB_RTL2832_SDR=m
 
 ##
+## file: drivers/staging/media/sn9c102/Kconfig
+##
+# CONFIG_USB_SN9C102 is not set
+
+##
 ## file: drivers/staging/media/solo6x10/Kconfig
 ##
 CONFIG_SOLO6X10=m