From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Fri, 15 Oct 2010 04:05:28 +0000 (-0700)
Subject: compat-wireless: fix patches for new wl1251 changes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1825131288fc1db1eedb650e1847fa5c64bc81c5;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: fix patches for new wl1251 changes

wl1251 gets its new directory now.

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

diff --git a/patches/06-header-changes.patch b/patches/06-header-changes.patch
index 124b70675dd9..112edb4291e4 100644
--- a/patches/06-header-changes.patch
+++ b/patches/06-header-changes.patch
@@ -6,18 +6,19 @@ cases.
 
 --- a/drivers/net/wireless/b43/phy_common.h
 +++ b/drivers/net/wireless/b43/phy_common.h
-@@ -2,6 +2,9 @@
+@@ -2,7 +2,10 @@
  #define LINUX_B43_PHY_COMMON_H_
  
  #include <linux/types.h>
+ #include <linux/nl80211.h>
 +#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28))
 +#include <asm/atomic.h>
 +#endif
  
  struct b43_wldev;
  
---- a/drivers/net/wireless/wl12xx/wl1251_boot.c
-+++ b/drivers/net/wireless/wl12xx/wl1251_boot.c
+--- a/drivers/net/wireless/wl1251/boot.c
++++ b/drivers/net/wireless/wl1251/boot.c
 @@ -19,7 +19,6 @@
   *
   */
@@ -26,8 +27,8 @@ cases.
  #include <linux/slab.h>
  
  #include "wl1251_reg.h"
---- a/drivers/net/wireless/wl12xx/wl1251_main.c
-+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
+--- a/drivers/net/wireless/wl1251/main.c
++++ b/drivers/net/wireless/wl1251/main.c
 @@ -24,6 +24,9 @@
  #include <linux/firmware.h>
  #include <linux/delay.h>
@@ -38,8 +39,8 @@ cases.
  #include <linux/crc32.h>
  #include <linux/etherdevice.h>
  #include <linux/vmalloc.h>
---- a/drivers/net/wireless/wl12xx/wl1251_spi.c
-+++ b/drivers/net/wireless/wl12xx/wl1251_spi.c
+--- a/drivers/net/wireless/wl1251/spi.c
++++ b/drivers/net/wireless/wl1251/spi.c
 @@ -23,6 +23,9 @@
  #include <linux/module.h>
  #include <linux/slab.h>
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index b0661cc9488c..264b540a7132 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -231,6 +231,7 @@ DRIVERS="$DRIVERS drivers/net/wireless/rtl818x"
 DRIVERS="$DRIVERS drivers/net/wireless/libertas_tf"
 DRIVERS="$DRIVERS drivers/net/wireless/ipw2x00"
 DRIVERS="$DRIVERS drivers/net/wireless/wl12xx"
+DRIVERS="$DRIVERS drivers/net/wireless/wl1251"
 DRIVERS="$DRIVERS drivers/net/wireless/iwmc3200wifi"
 DRIVERS="$DRIVERS drivers/net/wireless/orinoco"