move ath5k compat.diff changes to 03-rfkill.patch

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

diff --git a/compat/compat.diff b/compat/compat.diff
index f0606efa8fe000114c15cc3729e690bb7edf2b64..208d312b55b08d1a13d7ef25ed0e9d6630782bd8 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -92,20 +92,6 @@
 +cfg80211-y += compat-2.6.31.o
 +cfg80211-y += compat-2.6.32.o
 +
---- a/drivers/net/wireless/ath/ath5k/base.h
-+++ b/drivers/net/wireless/ath/ath5k/base.h
-@@ -46,7 +46,11 @@
- #include <linux/wireless.h>
- #include <linux/if_ether.h>
- #include <linux/leds.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
- #include <linux/rfkill.h>
-+#else
-+#include <linux/rfkill_backport.h>
-+#endif
- 
- #include "ath5k.h"
- #include "debug.h"
 --- a/drivers/net/wireless/b43/pcmcia.c        2009-07-08 23:31:13.028453519 -0700
 +++ b/drivers/net/wireless/b43/pcmcia.c        2009-07-08 23:31:15.213207643 -0700
 @@ -88,7 +88,11 @@ static int __devinit b43_pcmcia_probe(st

diff --git a/compat/diffs/03-rfkill.patch b/compat/diffs/03-rfkill.patch
index 47310d181f73ab3a22b49b07fbbb23216d2b3349..0f3b462939bccb4cfa09ada5faf51d535f3ea49a 100644 (file)
--- a/compat/diffs/03-rfkill.patch
+++ b/compat/diffs/03-rfkill.patch
@@ -137,3 +137,17 @@
        ah->rfsilent = ah->eep_ops->get_eeprom(ah, EEP_RF_SILENT);
        if (ah->rfsilent & EEP_RFSILENT_ENABLED) {
                ah->rfkill_gpio =
+--- a/drivers/net/wireless/ath/ath5k/base.h
++++ b/drivers/net/wireless/ath/ath5k/base.h
+@@ -46,7 +46,11 @@
+ #include <linux/wireless.h>
+ #include <linux/if_ether.h>
+ #include <linux/leds.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
+ #include <linux/rfkill.h>
++#else
++#include <linux/rfkill_backport.h>
++#endif
+ 
+ #include "ath5k.h"
+ #include "debug.h"