From 271987a133f3738bb017758cd05595b0e2968301 Mon Sep 17 00:00:00 2001
From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 7 Mar 2009 17:07:24 +0000
Subject: [PATCH] [kernel] extract the rfkill module to an extra package, only
 build rfkill module if it is not integrated into the kernel.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14780 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/kernel/modules/other.mk | 22 ++++++++++++++++++++++
 package/kernel/modules/usb.mk   | 10 +++-------
 package/mac80211/Makefile       |  4 ++--
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 1e6c1db25..8499c461f 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -786,3 +786,25 @@ endef
 
 $(eval $(call KernelPackage,textsearch))
 
+
+define KernelPackage/rfkill
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=RF switch subsystem support
+  DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 @!TARGET_rb532 @!TARGET_avr32 @!TARGET_brcm47xx @!TARGET_s3c24xx @!TARGET_ifxmips @!TARGET_atheros @!TARGET_adm5120 @!TARGET_ar7 @!TARGET_ppc40x @!TARGET_ixp4xx @!TARGET_rdc
+  KCONFIG:= \
+    CONFIG_RFKILL \
+    CONFIG_RFKILL_INPUT \
+    CONFIG_RFKILL_LEDS=y
+  FILES:= \
+    $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input)
+endef
+
+define KernelPackage/rfkill/description
+  Say Y here if you want to have control over RF switches
+  found on many WiFi and Bluetooth cards.
+endef
+
+$(eval $(call KernelPackage,rfkill))
+
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 66a5a951f..b6cb96fd3 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -576,16 +576,12 @@ $(eval $(call KernelPackage,usb-net-asix))
 
 
 define KernelPackage/usb-net-hso
-  $(call usbdep,kmod-usb-net @LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_23 @!LINUX_2_6_24 @!LINUX_2_6_25)
+  $(call usbdep,kmod-usb-net @LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_23 @!LINUX_2_6_24 @!LINUX_2_6_25 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill)
   TITLE:=Kernel module for Option USB High Speed Mobile Devices
-  KCONFIG:= \
-	CONFIG_RFKILL \
-	CONFIG_RFKILL_INPUT \
-	CONFIG_USB_HSO
+  KCONFIG:=CONFIG_USB_HSO
   FILES:= \
-	$(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,61,rfkill hso)
+  AUTOLOAD:=$(call AutoLoad,61,hso)
 endef
 
 define KernelPackage/usb-net-hso/description
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 1e515575b..a7945a03f 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -396,8 +396,8 @@ MAKE_OPTS:= \
 	CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
 	CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \
 	CONFIG_B43_PCMCIA=$(CONFIG_PCMCIA) \
-	CONFIG_B43_RFKILL=$(CONFIG_RFKILL) \
-	CONFIG_B43LEGACY_RFKILL=$(CONFIG_RFKILL) \
+	$(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y) \
+	$(if $(CONFIG_RFKILL),CONFIG_B43LEGACY_RFKILL=y) \
 	CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \
 	CONFIG_B43_LEDS=$(CONFIG_LEDS_TRIGGERS) \
 	$(if $(CONFIG_PACKAGE_kmod-b43),CONFIG_B43=m) \
-- 
2.35.1