[kernel] r18027 - in dists/trunk/linux-2.6/debian: . config config/armhf

[Ben Hutchings]

Author: benh
Date: Sun Aug 28 15:55:07 2011
New Revision: 18027

Log:
wl128x: Disable on all flavours except armhf/omap

Its dependencies are wrong, and it doesn't look like these chips are
likely to be used elsewhere.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armhf/config.omap
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Aug 28 15:41:11 2011	(r18026)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Aug 28 15:55:07 2011	(r18027)
@@ -24,6 +24,7 @@
   * media/rc: Enable IR_MCE_KBD_DECODER as module
   * gspca: Enable USB_GSPCA_SE401 as module
   * de4x5: Disable on all architectures except alpha (Closes: #639538)
+  * wl128x: Disable on all flavours except armhf/omap
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/armhf/config.omap
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.omap	Sun Aug 28 15:41:11 2011	(r18026)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.omap	Sun Aug 28 15:55:07 2011	(r18027)
@@ -118,6 +118,11 @@
 CONFIG_RADIO_SI4713=m
 
 ##
+## file: drivers/media/radio/wl128x/Kconfig
+##
+CONFIG_RADIO_WL128X=m
+
+##
 ## file: drivers/media/video/omap/Kconfig
 ##
 CONFIG_VIDEO_OMAP2_VOUT=m

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Aug 28 15:41:11 2011	(r18026)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Aug 28 15:55:07 2011	(r18027)
@@ -1101,7 +1101,7 @@
 ##
 ## file: drivers/media/radio/wl128x/Kconfig
 ##
-CONFIG_RADIO_WL128X=m
+# CONFIG_RADIO_WL128X is not set
 
 ##
 ## file: drivers/media/rc/Kconfig