From af16718a9c8d43a899e85deca1de273acc4b1e47 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 29 Apr 2011 05:00:37 +0000 Subject: [PATCH] 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 --- debian/changelog | 5 +++++ debian/config/config | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d9fa3113..e5a0748d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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. diff --git a/debian/config/config b/debian/config/config index c67c3ed5d..4e6dac97b 100644 --- a/debian/config/config +++ b/debian/config/config @@ -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