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

svn path=/dists/trunk/linux-2.6/; revision=17271
This commit is contained in:
Ben Hutchings 2011-04-29 05:00:37 +00:00
parent cd59fc01ec
commit af16718a9c
2 changed files with 9 additions and 4 deletions

5
debian/changelog vendored
View File

@ -10,6 +10,11 @@ linux-2.6 (2.6.39~rc5-1~experimental.1) UNRELEASED; urgency=low
* [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.

View File

@ -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