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

[Ben Hutchings]

Author: benh
Date: Fri Apr 29 05:00:37 2011
New Revision: 17271

Log:
Fix configuration for features that are no longer modular, thanks to Sedat Dilek

bluetooth: Re-enable BT_L2CAP and BT_SCO as part of bluetooth module
leds: Explicitly enable LEDS_CLASS as built-in
mfd: Explicitly disable MFD_WM8994

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Apr 29 03:58:19 2011	(r17270)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Apr 29 05:00:37 2011	(r17271)
@@ -10,6 +10,11 @@
   * [armhf] Actually install zImage into the linux-image package, thanks to
     Sebastian Reichel
   * [armhf] Build a linux-tools package
+  * Fix configuration for features that are no longer modular, thanks to
+    Sedat Dilek:
+    - bluetooth: Re-enable BT_L2CAP and BT_SCO as part of bluetooth module
+    - leds: Explicitly enable LEDS_CLASS as built-in
+    - mfd: Explicitly disable MFD_WM8994
 
   [ Aurelien Jarno ]
   * drm/nouveau, drm/radeon: fix build failure on mips.

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Apr 29 03:58:19 2011	(r17270)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Apr 29 05:00:37 2011	(r17271)
@@ -800,7 +800,7 @@
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_NET48XX=m
 CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
@@ -1383,7 +1383,7 @@
 CONFIG_TPS65010=m
 CONFIG_MFD_WM8400=m
 # CONFIG_MFD_WM8350_I2C is not set
-CONFIG_MFD_WM8994=m
+# CONFIG_MFD_WM8994 is not set
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
@@ -3693,8 +3693,8 @@
 ## file: net/bluetooth/Kconfig
 ##
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 
 ##
 ## file: net/bluetooth/bnep/Kconfig