From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 11 May 2009 20:46:51 +0000 (+0000)
Subject: Conditionals are not supported in Kconfig.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=de44ea0536083c9d8291d54973d28e49edbbd074;p=openwrt%2Fstaging%2Fadrian.git

Conditionals are not supported in Kconfig.

SVN-Revision: 15783
---

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index fcac951cac..811836127d 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -257,7 +257,6 @@ define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
   DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
   KCONFIG:= \
 	CONFIG_BLUEZ \
 	CONFIG_BLUEZ_L2CAP \
@@ -273,27 +272,9 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
 	CONFIG_BT_RFCOMM \
 	CONFIG_BT_BNEP \
 	CONFIG_BT_HCIBTUSB \
-	CONFIG_BT_HCIUART \
-	CONFIG_BT_HIDP
-else
-  KCONFIG:= \
-	CONFIG_BLUEZ \
-	CONFIG_BLUEZ_L2CAP \
-	CONFIG_BLUEZ_SCO \
-	CONFIG_BLUEZ_RFCOMM \
-	CONFIG_BLUEZ_BNEP \
-	CONFIG_BLUEZ_HCIUART \
-	CONFIG_BLUEZ_HCIUSB \
-	CONFIG_BLUEZ_HIDP \
-	CONFIG_BT \
-	CONFIG_BT_L2CAP \
-	CONFIG_BT_SCO \
-	CONFIG_BT_RFCOMM \
-	CONFIG_BT_BNEP \
 	CONFIG_BT_HCIUSB \
 	CONFIG_BT_HCIUART \
 	CONFIG_BT_HIDP
-endif
 endef
 
 define KernelPackage/bluetooth/2.4