19 files changed, 69 insertions, 69 deletions
diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index 45211c1c8b..792fb7bd67 100644
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -3,22 +3,22 @@ include $(TOPDIR)/rules.mk
 include ../rules.mk
 
 package-y += base-files
-package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
-package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
-package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
-package-$(BR2_PACKAGE_KMOD_BCM43XX_STANDALONE) += bcm43xx-standalone
-package-$(BR2_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape
-package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
-package-$(BR2_PACKAGE_KMOD_MADWIFI_OLD) += madwifi-old
-package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
-package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
-package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
-package-$(BR2_PACKAGE_KMOD_SPCA5XX) += spca5xx
-package-$(BR2_PACKAGE_KMOD_SWITCH) += switch
-package-$(BR2_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm
-package-$(BR2_PACKAGE_KMOD_DIAG) += diag
-package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
-package-$(BR2_PACKAGE_KMOD_ZD1211) += zd1211
+package-$(CONFIG_PACKAGE_KMOD_ALSA) += alsa
+package-$(CONFIG_PACKAGE_KMOD_FUSE) += fuse
+package-$(CONFIG_PACKAGE_KMOD_HOSTAP) += hostap
+package-$(CONFIG_PACKAGE_KMOD_BCM43XX_STANDALONE) += bcm43xx-standalone
+package-$(CONFIG_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape
+package-$(CONFIG_PACKAGE_KMOD_MADWIFI) += madwifi
+package-$(CONFIG_PACKAGE_KMOD_MADWIFI_OLD) += madwifi-old
+package-$(CONFIG_PACKAGE_KMOD_MINI_FO) += mini_fo
+package-$(CONFIG_PACKAGE_KMOD_OPENSWAN) += openswan
+package-$(CONFIG_PACKAGE_KMOD_SHFS) += shfs
+package-$(CONFIG_PACKAGE_KMOD_SPCA5XX) += spca5xx
+package-$(CONFIG_PACKAGE_KMOD_SWITCH) += switch
+package-$(CONFIG_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm
+package-$(CONFIG_PACKAGE_KMOD_DIAG) += diag
+package-$(CONFIG_PACKAGE_KMOD_WLCOMPAT) += wlcompat
+package-$(CONFIG_PACKAGE_KMOD_ZD1211) += zd1211
 
 bcm43xx-standalone-compile: ieee80211-dscape-compile
 wlcompat-compile: base-files-compile
diff --git a/target/linux/package/alsa/Config.in b/target/linux/package/alsa/Config.in
index df4da0b7d1..55d9abd1c4 100644
--- a/target/linux/package/alsa/Config.in
+++ b/target/linux/package/alsa/Config.in
@@ -1,9 +1,9 @@
-config BR2_PACKAGE_KMOD_ALSA
+config PACKAGE_KMOD_ALSA
 	prompt "kmod-alsa......................... Alsa Sound Drivers"
 	tristate
-    depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM
-	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-	select BR2_PACKAGE_KMOD_SOUNDCORE
-	default m if CONFIG_DEVEL
+    depends LINUX_2_4_X86 || LINUX_2_4_BRCM || LINUX_2_6_X86 || LINUX_2_6_BRCM
+	depends PACKAGE_KMOD_USB_CONTROLLER
+	select PACKAGE_KMOD_SOUNDCORE
+	default m if DEVEL
 	help
 	  Alsa Drivers for USB Soundcards
diff --git a/target/linux/package/bcm43xx-standalone/Config.in b/target/linux/package/bcm43xx-standalone/Config.in
index 5e15f8121c..84a4702cf2 100644
--- a/target/linux/package/bcm43xx-standalone/Config.in
+++ b/target/linux/package/bcm43xx-standalone/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_BCM43XX_STANDALONE
+config PACKAGE_KMOD_BCM43XX_STANDALONE
 	prompt "kmod-bcm43xx-standalone............... Free Broadcom 43xx wireless driver (devicescape stack)"
 	tristate
-	depends BR2_LINUX_2_6_BRCM
-	select BR2_PACKAGE_KMOD_IEEE80211_DSCAPE
+	depends LINUX_2_6_BRCM
+	select PACKAGE_KMOD_IEEE80211_DSCAPE
 	default n
 	help
 	  Free driver for the Broadcom 43xx wireless chipset
diff --git a/target/linux/package/diag/Config.in b/target/linux/package/diag/Config.in
index 70f726c5b6..80cba50cf2 100644
--- a/target/linux/package/diag/Config.in
+++ b/target/linux/package/diag/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_DIAG
+config PACKAGE_KMOD_DIAG
 	prompt "kmod-diag......................... Driver for router LEDs and Buttons"
 	tristate
-	depends BR2_LINUX_2_4_BRCM
+	depends LINUX_2_4_BRCM
 	default y
 	help
 	  Driver for router LEDs and Buttons
diff --git a/target/linux/package/fuse/Config.in b/target/linux/package/fuse/Config.in
index 8fbb34c079..d51229522b 100644
--- a/target/linux/package/fuse/Config.in
+++ b/target/linux/package/fuse/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_FUSE
+config PACKAGE_KMOD_FUSE
 	prompt "kmod-fuse......................... FUSE kernel module"
 	tristate
-	default m if CONFIG_DEVEL
+	default m if DEVEL
 	help
 	  With FUSE it is possible to implement a fully functional 
 	  filesystem in a userspace program.
diff --git a/target/linux/package/hostap/Config.in b/target/linux/package/hostap/Config.in
index 767b459316..39b49d4c4b 100644
--- a/target/linux/package/hostap/Config.in
+++ b/target/linux/package/hostap/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_HOSTAP
+config PACKAGE_KMOD_HOSTAP
 	prompt "kmod-hostap....................... Host AP support for Prism2/2.5/3 IEEE 802.11b"
 	tristate
-	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM
-	default m if CONFIG_DEVEL
+	depends LINUX_2_4_X86 || LINUX_2_4_BRCM
+	default m if DEVEL
 	help
 	  A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3
 	  chipset. This driver supports so called Host AP mode that allows
@@ -14,11 +14,11 @@ config BR2_PACKAGE_KMOD_HOSTAP
 	  
 	  http://hostap.epitest.fi/
 
-config BR2_PACKAGE_KMOD_HOSTAP_PCI
+config PACKAGE_KMOD_HOSTAP_PCI
 	prompt   "kmod-hostap-pci................. Host AP driver for Prism2.5 PCI adaptors"
 	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_KMOD_HOSTAP
+	default m if DEVEL
+	depends PACKAGE_KMOD_HOSTAP
 	help
 	  Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
 	  driver and its help text includes more information about the Host AP
@@ -26,11 +26,11 @@ config BR2_PACKAGE_KMOD_HOSTAP_PCI
 	  
 	  http://hostap.epitest.fi/
 
-config BR2_PACKAGE_KMOD_HOSTAP_PLX
+config PACKAGE_KMOD_HOSTAP_PLX
 	prompt   "kmod-hostap-plx................. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors"
 	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_KMOD_HOSTAP
+	default m if DEVEL
+	depends PACKAGE_KMOD_HOSTAP
 	help
 	  Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
 	  driver and its help text includes more information about the Host AP
diff --git a/target/linux/package/ieee80211-dscape/Config.in b/target/linux/package/ieee80211-dscape/Config.in
index a440ee2607..d747ed2fba 100644
--- a/target/linux/package/ieee80211-dscape/Config.in
+++ b/target/linux/package/ieee80211-dscape/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_IEEE80211_DSCAPE
+config PACKAGE_KMOD_IEEE80211_DSCAPE
 	prompt "kmod-ieee80211-dscape............. IEEE 802.11 stack (devicescape)"
 	tristate
 	default n
-	depends BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_X86
+	depends LINUX_2_6_BRCM || LINUX_2_6_X86
 	
 	help
 	  IEEE 802.11 stack (devicescape)
diff --git a/target/linux/package/madwifi-old/Config.in b/target/linux/package/madwifi-old/Config.in
index 115ce03f60..ec0385540d 100644
--- a/target/linux/package/madwifi-old/Config.in
+++ b/target/linux/package/madwifi-old/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_MADWIFI_OLD
+config PACKAGE_KMOD_MADWIFI_OLD
        prompt "kmod-madwifi-old.................. (old) Atheros Wifi driver"
        tristate
-       default m if CONFIG_DEVEL
+       default m if DEVEL
        default n
        help
          Madwifi-old driver for Atheros wireless adapters
diff --git a/target/linux/package/madwifi-old/Makefile b/target/linux/package/madwifi-old/Makefile
index 25c64df50a..7d369722aa 100644
--- a/target/linux/package/madwifi-old/Makefile
+++ b/target/linux/package/madwifi-old/Makefile
@@ -26,10 +26,10 @@ endif
 
 BUS := PCI
 
-ifneq ($(BR2_LINUX_2_4_AR531X),)
+ifneq ($(CONFIG_LINUX_2_4_AR531X),)
 	BUS := AHB
 endif
-# ifneq ($(BR2_LINUX_2_6_ARUBA),)
+# ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
 #      BUS := PCI AHB  # no suitable HAL for AHB yet.
 # endif
 
diff --git a/target/linux/package/madwifi/Config.in b/target/linux/package/madwifi/Config.in
index b554e672fd..6eda342f81 100644
--- a/target/linux/package/madwifi/Config.in
+++ b/target/linux/package/madwifi/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_MADWIFI
+config PACKAGE_KMOD_MADWIFI
 	prompt "kmod-madwifi...................... Atheros Wifi driver"
 	tristate
-	default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_ARUBA || BR2_LINUX_2_4_AR531X
-	default m if CONFIG_DEVEL
+	default y if LINUX_2_6_BRCM || LINUX_2_6_ARUBA || LINUX_2_4_AR531X
+	default m if DEVEL
 	default n
 	help
 	  Driver for Atheros 802.11a/b/g MiniPCI cards
diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile
index fcdac9097f..d42372b52e 100644
--- a/target/linux/package/madwifi/Makefile
+++ b/target/linux/package/madwifi/Makefile
@@ -26,10 +26,10 @@ endif
 
 BUS := PCI
 
-ifneq ($(BR2_LINUX_2_4_AR531X),)
+ifneq ($(CONFIG_LINUX_2_4_AR531X),)
 	BUS := AHB
 endif
-ifneq ($(BR2_LINUX_2_6_ARUBA),)
+ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
 	BUS := PCI AHB	# no suitable HAL for AHB yet.
 endif
 
diff --git a/target/linux/package/mini_fo/Config.in b/target/linux/package/mini_fo/Config.in
index a92ff9785a..a280ff56a8 100644
--- a/target/linux/package/mini_fo/Config.in
+++ b/target/linux/package/mini_fo/Config.in
@@ -1,6 +1,6 @@
-config BR2_PACKAGE_KMOD_MINI_FO
+config PACKAGE_KMOD_MINI_FO
 	prompt "kmod-mini_fo...................... mini fanout overlay file system"
 	tristate
-	default m if CONFIG_DEVEL
+	default m if DEVEL
 	help
 	  The mini fanout overlay file system.
diff --git a/target/linux/package/openswan/Config.in b/target/linux/package/openswan/Config.in
index 59a943f8e4..faf0f8f4a6 100644
--- a/target/linux/package/openswan/Config.in
+++ b/target/linux/package/openswan/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_OPENSWAN
+config PACKAGE_KMOD_OPENSWAN
 	prompt "kmod-openswan..................... Openswan kernel module"
 	tristate
-	default m if CONFIG_DEVEL
+	default m if DEVEL
 	help
 	  Openswan is an implementation of IPsec for Linux.
 	  
diff --git a/target/linux/package/shfs/Config.in b/target/linux/package/shfs/Config.in
index 61bd54b5e5..71cc327073 100644
--- a/target/linux/package/shfs/Config.in
+++ b/target/linux/package/shfs/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_SHFS
+config PACKAGE_KMOD_SHFS
 	prompt "kmod-shfs......................... Shell FileSystem kernel module (ShFS) kernel module"
 	tristate
-	default m if CONFIG_DEVEL
+	default m if DEVEL
 	help
 	  ShFS is a simple and easy to use Linux kernel module which 
 	  allows you to mount remote filesystems using a plain shell 
diff --git a/target/linux/package/spca5xx/Config.in b/target/linux/package/spca5xx/Config.in
index 6d504823f1..729e6b0094 100644
--- a/target/linux/package/spca5xx/Config.in
+++ b/target/linux/package/spca5xx/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_SPCA5XX
+config PACKAGE_KMOD_SPCA5XX
 	prompt "kmod-spca5xx...................... Kernel driver for SPCA5XX based USB cameras"
 	tristate
-	default m if CONFIG_DEVEL
+	default m if DEVEL
 	help
 	  Kernel driver for SPCA5XX based USB cameras
 	  
diff --git a/target/linux/package/switch/Config.in b/target/linux/package/switch/Config.in
index 407d5deb68..0ff2aa1aba 100644
--- a/target/linux/package/switch/Config.in
+++ b/target/linux/package/switch/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_SWITCH
+config PACKAGE_KMOD_SWITCH
 	prompt "kmod-switch....................... Kernel driver for ROBO and ADMTEK SWITCH"
 	tristate
-	default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_4_BRCM
-	default m if CONFIG_DEVEL
+	default y if LINUX_2_6_BRCM || LINUX_2_4_BRCM
+	default m if DEVEL
 	default n
 	help
 	  Kernel driver for ROBO and ADMTEK switches.
diff --git a/target/linux/package/ueagle-atm/Config.in b/target/linux/package/ueagle-atm/Config.in
index 17b619cef8..c92fc2f724 100644
--- a/target/linux/package/ueagle-atm/Config.in
+++ b/target/linux/package/ueagle-atm/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_UEAGLE_ATM
+config PACKAGE_KMOD_UEAGLE_ATM
 	prompt "kmod-ueagle-atm.................... Kernel driver for Eagle 8051 based USB ADSL modems"
 	tristate
-	depends BR2_LINUX_2_6_BRCM
-	default m if CONFIG_DEVEL
+	depends LINUX_2_6_BRCM
+	default m if DEVEL
 	help
 	  Kernel driver for Eagle 8051 USB ADSL modems
 	  
diff --git a/target/linux/package/wlcompat/Config.in b/target/linux/package/wlcompat/Config.in
index 1e5f5e79e0..904d1e6645 100644
--- a/target/linux/package/wlcompat/Config.in
+++ b/target/linux/package/wlcompat/Config.in
@@ -1,17 +1,17 @@
-config BR2_PACKAGE_KMOD_WLCOMPAT
+config PACKAGE_KMOD_WLCOMPAT
 	prompt "kmod-wlcompat..................... Wrapper providing Wireless Extensions for Broadcom wl module"
 	tristate
 	default y
-	depends BR2_PACKAGE_KMOD_BRCM_WL || BR2_PACKAGE_KMOD_BRCM_WL2
+	depends PACKAGE_KMOD_BRCM_WL || PACKAGE_KMOD_BRCM_WL2
 	help
 	  A wrapper module, that provides Wireless Extension support for the
 	  proprietary Broadcom wl module.
 
-config BR2_PACKAGE_KMOD_WLCOMPAT_DEBUG
+config PACKAGE_KMOD_WLCOMPAT_DEBUG
 	prompt "kmod-wlcompat-debug............... Wrapper providing Wireless Extensions for Broadcom wl module (debug)"
 	tristate
 	default m
-	depends BR2_PACKAGE_KMOD_BRCM_WL || BR2_PACKAGE_KMOD_BRCM_WL2
+	depends PACKAGE_KMOD_BRCM_WL || PACKAGE_KMOD_BRCM_WL2
 	help
 	  A wrapper module, that provides Wireless Extension support for the
 	  proprietary Broadcom wl module. (debug version)
diff --git a/target/linux/package/zd1211/Config.in b/target/linux/package/zd1211/Config.in
index 2852c84e55..cadfa4f5dd 100644
--- a/target/linux/package/zd1211/Config.in
+++ b/target/linux/package/zd1211/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_ZD1211
+config PACKAGE_KMOD_ZD1211
 	prompt "kmod-zd12111...................... Driver for Zydas 1211 based devices"
 	tristate
-	depends BR2_LINUX_2_6
-	default m if CONFIG_DEVEL
+	depends LINUX_2_6
+	default m if DEVEL
 	help
 	  Linux driver for the ZyDAS ZD1211 802.11b/g USB-WLAN-Chip. 
 	  Initially contributed by ZyDAS, this driver is actively maintained