From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Tue, 4 Aug 2009 20:35:33 +0000 (-0700)
Subject: Move wl12xx changes to 07-header-changes.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5ce0a53fb0b93229afd64499cc27dea2cb0d68bd;p=openwrt%2Fstaging%2Fblogic.git

Move wl12xx changes to 07-header-changes.patch

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

diff --git a/compat/compat.diff b/compat/compat.diff
index 70f9800d4aca..3c5c1b866012 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -47,30 +47,6 @@
 +cfg80211-y += compat-2.6.31.o
 +cfg80211-y += compat-2.6.32.o
 +
---- a/drivers/net/wireless/wl12xx/wl1251_main.c
-+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
-@@ -26,6 +26,9 @@
- #include <linux/firmware.h>
- #include <linux/delay.h>
- #include <linux/irq.h>
-+#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28))
-+#include <linux/device.h>
-+#endif
- #include <linux/spi/spi.h>
- #include <linux/crc32.h>
- #include <linux/etherdevice.h>
---- a/drivers/net/wireless/wl12xx/wl1251_spi.c
-+++ b/drivers/net/wireless/wl12xx/wl1251_spi.c
-@@ -23,6 +23,9 @@
- 
- #include <linux/module.h>
- #include <linux/crc7.h>
-+#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28))
-+#include <linux/device.h>
-+#endif
- #include <linux/spi/spi.h>
- 
- #include "wl1251.h"
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
 @@ -23,6 +23,7 @@
diff --git a/compat/diffs/07-header-changes.patch b/compat/diffs/07-header-changes.patch
index 60e33c6457ad..b8d020bdb454 100644
--- a/compat/diffs/07-header-changes.patch
+++ b/compat/diffs/07-header-changes.patch
@@ -10,3 +10,27 @@
  
  struct b43_wldev;
  
+--- a/drivers/net/wireless/wl12xx/wl1251_main.c
++++ b/drivers/net/wireless/wl12xx/wl1251_main.c
+@@ -26,6 +26,9 @@
+ #include <linux/firmware.h>
+ #include <linux/delay.h>
+ #include <linux/irq.h>
++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28))
++#include <linux/device.h>
++#endif
+ #include <linux/spi/spi.h>
+ #include <linux/crc32.h>
+ #include <linux/etherdevice.h>
+--- a/drivers/net/wireless/wl12xx/wl1251_spi.c
++++ b/drivers/net/wireless/wl12xx/wl1251_spi.c
+@@ -23,6 +23,9 @@
+ 
+ #include <linux/module.h>
+ #include <linux/crc7.h>
++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28))
++#include <linux/device.h>
++#endif
+ #include <linux/spi/spi.h>
+ 
+ #include "wl1251.h"