[kernel] fix yaffs build failure on 2.6.28.2 (thanks to Alexandros C. Couloumbis...

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 210-mac80211_include_wireless_dev.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/210-mac80211_include_wireless_dev.patch b/target/linux/generic-2.6/patches-2.6.23/210-mac80211_include_wireless_dev.patch
index 598c9ccbaf7cfdeaecb8a4e12be2778fe7107e9e..cca0c0b840ff017dd2722e32590bb0cc8e796b20 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/210-mac80211_include_wireless_dev.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/210-mac80211_include_wireless_dev.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.23-rc6/include/linux/ieee80211.h
-===================================================================
---- linux-2.6.23-rc6.orig/include/linux/ieee80211.h    2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/ieee80211.h 2007-09-21 16:24:07.000000000 +0800
+--- a/include/linux/ieee80211.h
++++ b/include/linux/ieee80211.h
 @@ -106,6 +106,75 @@
  } __attribute__ ((packed));
  
@@ -300,10 +298,8 @@ Index: linux-2.6.23-rc6/include/linux/ieee80211.h
 +};
 +
  #endif /* IEEE80211_H */
-Index: linux-2.6.23-rc6/include/linux/nl80211.h
-===================================================================
---- linux-2.6.23-rc6.orig/include/linux/nl80211.h      2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/nl80211.h   2007-09-21 16:24:07.000000000 +0800
+--- a/include/linux/nl80211.h
++++ b/include/linux/nl80211.h
 @@ -7,6 +7,217 @@
   */
  
@@ -579,10 +575,8 @@ Index: linux-2.6.23-rc6/include/linux/nl80211.h
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
-Index: linux-2.6.23-rc6/include/net/cfg80211.h
-===================================================================
---- linux-2.6.23-rc6.orig/include/net/cfg80211.h       2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/include/net/cfg80211.h    2007-09-21 16:24:07.000000000 +0800
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
@@ -725,10 +719,8 @@ Index: linux-2.6.23-rc6/include/net/cfg80211.h
 +                          u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */
-Index: linux-2.6.23-rc6/include/net/iw_handler.h
-===================================================================
---- linux-2.6.23-rc6.orig/include/net/iw_handler.h     2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/include/net/iw_handler.h  2007-09-21 16:24:07.000000000 +0800
+--- a/include/net/iw_handler.h
++++ b/include/net/iw_handler.h
 @@ -431,7 +431,13 @@
   * Those may be called only within the kernel.
   */
@@ -744,10 +736,8 @@ Index: linux-2.6.23-rc6/include/net/iw_handler.h
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *   dev,
-Index: linux-2.6.23-rc6/include/net/mac80211.h
-===================================================================
---- linux-2.6.23-rc6.orig/include/net/mac80211.h       2007-09-21 16:23:52.000000000 +0800
-+++ linux-2.6.23-rc6/include/net/mac80211.h    2007-09-21 16:24:07.000000000 +0800
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
 @@ -300,7 +300,6 @@
        /* Following five fields are used for IEEE 802.11H */
        unsigned int radar_detect;