diff -uprN debian-trunk.orig/config/config debian-trunk/config/config
--- debian-trunk.orig/config/config  2011-04-27 17:14:59.169280262 +0200
+++ debian-trunk/config/config       2011-04-27 18:35:33.260507504 +0200
@@ -800,7 +800,7 @@ CONFIG_MISDN_L1OIP=m
 ## 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_HTC_PASIC3=m
 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 @@ CONFIG_BATMAN_ADV=m
 ## 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