From 80ca42f9fbf34f0f6ace261124cfcf933812a392 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Tue, 4 Aug 2009 11:10:37 -0700
Subject: [PATCH] move ath5k compat.diff changes to 03-rfkill.patch

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 compat/compat.diff           | 14 --------------
 compat/diffs/03-rfkill.patch | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/compat/compat.diff b/compat/compat.diff
index f0606efa8fe0..208d312b55b0 100644
--- 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 47310d181f73..0f3b462939bc 100644
--- 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"
-- 
2.30.2