diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-09-23 13:01:33 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:58:50 +0200 |
| commit | 10ea1684a52b5cd0c6b68b5e37bd0bc0c99d5e68 (patch) | |
| tree | 56c1f88e0a5c346a2439bc8ceb790daec6c5afe8 /net | |
| parent | 68e06c9192a3291000bea5f2702c58d9a292884e (diff) | |
Revert "WLAN: Add symlink to compat-wireless"
This reverts commit 7af327e4265826a1373a6281aa9b343e78d90ce1.
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 84 | ||||
| -rw-r--r-- | net/Makefile | 4 | ||||
| l--------- | net/compat-wireless | 1 |
3 files changed, 0 insertions, 89 deletions
diff --git a/net/Kconfig b/net/Kconfig index 04940819819..878151c772c 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -309,96 +309,12 @@ menuconfig WIRELESS depends on !S390 default y -# -# These are for the compat-wireless git -# - -config COMPAT_WIRELESS - tristate "Compat Wireless" - default n - ---help--- - To compile this code as a module, choose M here. -if COMPAT_WIRELESS - -config CFG80211 - tristate "Compat CFG80211" - default n - ---help--- - To compile this code as a module, choose M here. - -config COMPAT_MAC80211_RC_DEFAULT - string "MAC80211_RC_DEFAULT" - default "minstrel" - ---help--- - -config MAC80211_RC_DEFAULT_MINSTREL - bool "MAC80211_RC_DEFAULT_MINSTREL" - depends on COMPAT_WIRELESS - default y - ---help--- - -config COMPAT_RFKILL - tristate "Compat RFKILL" - depends on COMPAT_WIRELESS - default y - ---help--- - -config NL80211_TESTMODE - bool "Compat NL80211 testmode" - depends on COMPAT_WIRELESS - default y - ---help--- - -config CFG80211_DEFAULT_PS - bool "CFG80211_DEFAULT_PS" - depends on COMPAT_WIRELESS - default y - ---help--- - -config CFG80211_REG_DEBUG - bool "CFG80211_REG_DEBUG" - depends on COMPAT_WIRELESS - default y - ---help--- - -config MAC80211_RC_PID - bool "MAC80211_RC_PID" - depends on COMPAT_WIRELESS - default y - ---help--- - -config MAC80211_RC_MINSTREL - bool "MAC80211_RC_MINSTREL" - depends on COMPAT_WIRELESS - default y - ---help--- - -config MAC80211_LEDS - bool "MAC80211_LEDS" - depends on COMPAT_WIRELESS - default y - ---help--- - -config MAC80211_MESH - bool "MAC80211_MESH" - depends on COMPAT_WIRELESS - default y - ---help--- - -endif - -# -# End compat-wireless -# - -if !COMPAT_WIRELESS if WIRELESS source "net/wireless/Kconfig" source "net/mac80211/Kconfig" endif # WIRELESS -endif #!COMPAT_WIRELESS source "net/wimax/Kconfig" diff --git a/net/Makefile b/net/Makefile index 9186c4bd78e..a51d9465e62 100644 --- a/net/Makefile +++ b/net/Makefile @@ -48,12 +48,8 @@ endif obj-$(CONFIG_IP_DCCP) += dccp/ obj-$(CONFIG_IP_SCTP) += sctp/ obj-$(CONFIG_RDS) += rds/ -ifneq ($(CONFIG_COMPAT_WIRELESS),) -obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless/ -else obj-$(CONFIG_WIRELESS) += wireless/ obj-$(CONFIG_MAC80211) += mac80211/ -endif obj-$(CONFIG_TIPC) += tipc/ obj-$(CONFIG_NETLABEL) += netlabel/ obj-$(CONFIG_IUCV) += iucv/ diff --git a/net/compat-wireless b/net/compat-wireless deleted file mode 120000 index 7b862a0bd9e..00000000000 --- a/net/compat-wireless +++ /dev/null @@ -1 +0,0 @@ -../../vendor/st-ericsson/connectivity/wlan/compat-wireless
\ No newline at end of file |