From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Mon, 6 Jul 2009 19:04:27 +0000 (-0700)
Subject: Fix compat.diff for net/wireless/Makefile
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f0112a85ac93df806f9e289533acec5712314a81;p=openwrt%2Fstaging%2Fblogic.git

Fix compat.diff for net/wireless/Makefile

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---

diff --git a/compat/compat.diff b/compat/compat.diff
index 746f79e1fd95..7ffd9a1e5764 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -151,8 +151,7 @@
  obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
  obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
  
--cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o
-+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o compat.o
+ cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o
 +
 +# Compat-wireless kernel compatibility code
 +cfg80211-y += compat-2.6.28.o
@@ -1169,21 +1168,6 @@
  
  	/* causes rfkill_start() to be called */
  	error = input_register_handle(handle);
---- a/net/wireless/Makefile
-+++ b/net/wireless/Makefile
-@@ -1,11 +1,10 @@
--obj-$(CONFIG_WIRELESS_EXT) += wext.o
- obj-$(CONFIG_CFG80211) += cfg80211.o
- obj-$(CONFIG_LIB80211) += lib80211.o
- obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
- obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
- obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
- 
--cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o
-+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o compat.o
- cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
- cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o
- 
 --- a/net/wireless/core.c
 +++ b/net/wireless/core.c
 @@ -260,7 +260,11 @@ static void cfg80211_rfkill_sync_work(struct work_struct *work)