move net/wireless/core.h 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 befb8c5cfc4b10ea57a378afcae2010c15cf7f52..7352b1f30250694d91ef53b5f0e29814130cc1ef 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -438,20 +438,6 @@
  
        return ops;
  }
---- a/net/wireless/core.h      2009-07-07 13:32:53.367707921 -0700
-+++ b/net/wireless/core.h      2009-07-07 13:32:53.943703622 -0700
-@@ -11,7 +11,11 @@
- #include <linux/kref.h>
- #include <linux/rbtree.h>
- #include <linux/debugfs.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
- #include <linux/rfkill.h>
-+#else
-+#include <linux/rfkill_backport.h>
-+#endif
- #include <linux/workqueue.h>
- #include <net/genetlink.h>
- #include <net/cfg80211.h>
 --- a/drivers/net/wireless/Makefile    2009-07-06 12:53:07.479194884 -0700
 +++ b/drivers/net/wireless/Makefile    2009-07-06 12:54:42.026195576 -0700
 @@ -5,43 +5,16 @@

diff --git a/compat/diffs/03-rfkill.patch b/compat/diffs/03-rfkill.patch
index c6ffa863e9425cef6c2a3affddee1af66b136d85..24352e8d31f876ca617d48e691fe3a812da6f286 100644 (file)
--- a/compat/diffs/03-rfkill.patch
+++ b/compat/diffs/03-rfkill.patch
@@ -161,6 +161,20 @@
  /**
   * rfkill_alloc - allocate rfkill structure
   * @name: name of the struct -- the string is not copied internally
+--- a/net/wireless/core.h      2009-07-07 13:32:53.367707921 -0700
++++ b/net/wireless/core.h      2009-07-07 13:32:53.943703622 -0700
+@@ -11,7 +11,11 @@
+ #include <linux/kref.h>
+ #include <linux/rbtree.h>
+ #include <linux/debugfs.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
+ #include <linux/rfkill.h>
++#else
++#include <linux/rfkill_backport.h>
++#endif
+ #include <linux/workqueue.h>
+ #include <net/genetlink.h>
+ #include <net/cfg80211.h>
 --- 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 @@