aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2008-06-08 08:30:18 -0700
committerLuis R. Rodriguez <lrodriguez@atheros.com>2008-06-08 08:30:18 -0700
commit34356d75355b56dafaf571b436a1f12619b897f1 (patch)
treee31e24de4b37f155b720578dc2994053bb89c142
parent462db84332d27fff411136cb4a32728006bb0b0e (diff)
downloadcompat-wireless-2.6-old-34356d75355b56dafaf571b436a1f12619b897f1.tar.gz
Shut the compiler for older kernels for intel rfkill with complaint on BIT()
being redefined. We can remove this and fix this properly once RFKIL is properly backported, and if someone does this work. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
-rw-r--r--compat/compat.diff11
1 files changed, 11 insertions, 0 deletions
diff --git a/compat/compat.diff b/compat/compat.diff
index fee0f2d..54036f0 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -1098,3 +1098,14 @@
/**
* enum mac80211_rx_flags - receive flags
+--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.h 2008-06-08 07:33:03.000000000 -0700
++++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.h 2008-06-08 07:33:42.000000000 -0700
+@@ -31,8 +31,6 @@
+ struct iwl_priv;
+
+ #include <linux/rfkill.h>
+-#include <linux/input.h>
+-
+
+ #ifdef CONFIG_IWLWIFI_RFKILL
+ struct iwl_rfkill_mngr {