Move ath9k hunks to 03-rfkill.patch

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

diff --git a/compat/compat.diff b/compat/compat.diff
index 82cb8f65e6244b71181eaceda17f66ee804593dd..f0606efa8fe000114c15cc3729e690bb7edf2b64 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -106,17 +106,6 @@
  
  #include "ath5k.h"
  #include "debug.h"
---- a/drivers/net/wireless/ath/ath9k/hw.c      2009-07-27 14:41:59.497061239 -0700
-+++ b/drivers/net/wireless/ath/ath9k/hw.c      2009-07-27 14:41:59.861073081 -0700
-@@ -3515,7 +3515,7 @@
- 
-       pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
- 
--#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) && defined(CONFIG_RFKILL_BACKPORT) || defined(CONFIG_RFKILL_BACKPORT_MODULE))
-       ah->rfsilent = ah->eep_ops->get_eeprom(ah, EEP_RF_SILENT);
-       if (ah->rfsilent & EEP_RFSILENT_ENABLED) {
-               ah->rfkill_gpio =
 --- 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 b81f2027e5ba261782b1e99f4e5f584821965535..47310d181f73ab3a22b49b07fbbb23216d2b3349 100644 (file)
--- a/compat/diffs/03-rfkill.patch
+++ b/compat/diffs/03-rfkill.patch
@@ -126,3 +126,14 @@
  /**
   * rfkill_alloc - allocate rfkill structure
   * @name: name of the struct -- the string is not copied internally
+--- a/drivers/net/wireless/ath/ath9k/hw.c      2009-08-04 11:07:27.734023469 -0700
++++ b/drivers/net/wireless/ath/ath9k/hw.c      2009-08-04 11:07:28.482002411 -0700
+@@ -3601,7 +3601,7 @@
+ 
+       pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
+ 
+-#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
++#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) && defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)) || ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) && defined(CONFIG_RFKILL_BACKPORT) || defined(CONFIG_RFKILL_BACKPORT_MODULE))
+       ah->rfsilent = ah->eep_ops->get_eeprom(ah, EEP_RF_SILENT);
+       if (ah->rfsilent & EEP_RFSILENT_ENABLED) {
+               ah->rfkill_gpio =