mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13
[openwrt-10.03/.git] / package / mac80211 / patches / 012-remove_rfkill.patch
1 --- a/drivers/net/wireless/ath/ath5k/base.h
2 +++ b/drivers/net/wireless/ath/ath5k/base.h
3 @@ -46,7 +46,7 @@
4  #include <linux/wireless.h>
5  #include <linux/if_ether.h>
6  #include <linux/leds.h>
7 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
8 +#if 0
9  #include <linux/rfkill.h>
10  #else
11  #include <linux/rfkill_backport.h>
12 --- a/net/wireless/core.h
13 +++ b/net/wireless/core.h
14 @@ -11,7 +11,7 @@
15  #include <linux/kref.h>
16  #include <linux/rbtree.h>
17  #include <linux/debugfs.h>
18 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
19 +#if 0
20  #include <linux/rfkill.h>
21  #else
22  #include <linux/rfkill_backport.h>
23 --- a/include/linux/rfkill_backport.h
24 +++ b/include/linux/rfkill_backport.h
25 @@ -149,7 +149,7 @@ struct rfkill_ops {
26         int     (*set_block)(void *data, bool blocked);
27  };
28  
29 -#if defined(CONFIG_RFKILL_BACKPORT) || defined(CONFIG_RFKILL_BACKPORT_MODULE)
30 +#if 0
31  /**
32   * rfkill_alloc - allocate rfkill structure
33   * @name: name of the struct -- the string is not copied internally