2009-09-27 06:05:46 +08:00
|
|
|
--- a/drivers/net/wireless/ath/ath5k/base.h
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath5k/base.h
|
|
|
|
|
@@ -46,7 +46,7 @@
|
|
|
|
|
#include <linux/wireless.h>
|
|
|
|
|
#include <linux/if_ether.h>
|
|
|
|
|
#include <linux/leds.h>
|
|
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
|
|
|
|
|
+#if 0
|
|
|
|
|
#include <linux/rfkill.h>
|
|
|
|
|
#else
|
|
|
|
|
#include <linux/rfkill_backport.h>
|
|
|
|
|
--- a/net/wireless/core.h
|
|
|
|
|
+++ b/net/wireless/core.h
|
|
|
|
|
@@ -11,7 +11,7 @@
|
|
|
|
|
#include <linux/kref.h>
|
|
|
|
|
#include <linux/rbtree.h>
|
|
|
|
|
#include <linux/debugfs.h>
|
|
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
|
|
|
|
|
+#if 0
|
|
|
|
|
#include <linux/rfkill.h>
|
|
|
|
|
#else
|
|
|
|
|
#include <linux/rfkill_backport.h>
|
|
|
|
|
--- a/include/linux/rfkill_backport.h
|
|
|
|
|
+++ b/include/linux/rfkill_backport.h
|
2009-10-11 08:36:23 +08:00
|
|
|
@@ -146,7 +146,7 @@ struct rfkill_ops {
|
2009-09-27 06:05:46 +08:00
|
|
|
int (*set_block)(void *data, bool blocked);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
-#if defined(CONFIG_RFKILL_BACKPORT) || defined(CONFIG_RFKILL_MODULE_BACKPORT)
|
|
|
|
|
+#if 0
|
|
|
|
|
/**
|
|
|
|
|
* rfkill_alloc - allocate rfkill structure
|
|
|
|
|
* @name: name of the struct -- the string is not copied internally
|
