diff options
-rw-r--r-- | drivers/net/wireless/ath/Makefile | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/Makefile | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs_debug.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/dfs_pattern_detector.c (renamed from drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/dfs_pattern_detector.h (renamed from drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h) | 0 | ||||
-rw-r--r-- | drivers/net/wireless/ath/dfs_pri_detector.c (renamed from drivers/net/wireless/ath/ath9k/dfs_pri_detector.c) | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/dfs_pri_detector.h (renamed from drivers/net/wireless/ath/ath9k/dfs_pri_detector.h) | 0 |
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile index 363b05653c7e..7d023b0f13b4 100644 --- a/drivers/net/wireless/ath/Makefile +++ b/drivers/net/wireless/ath/Makefile | |||
@@ -12,7 +12,9 @@ obj-$(CONFIG_ATH_COMMON) += ath.o | |||
12 | ath-objs := main.o \ | 12 | ath-objs := main.o \ |
13 | regd.o \ | 13 | regd.o \ |
14 | hw.o \ | 14 | hw.o \ |
15 | key.o | 15 | key.o \ |
16 | dfs_pattern_detector.o \ | ||
17 | dfs_pri_detector.o | ||
16 | 18 | ||
17 | ath-$(CONFIG_ATH_DEBUG) += debug.o | 19 | ath-$(CONFIG_ATH_DEBUG) += debug.o |
18 | ccflags-y += -D__CHECK_ENDIAN__ | 20 | ccflags-y += -D__CHECK_ENDIAN__ |
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile index 75ee9e7704ce..6205ef5a9321 100644 --- a/drivers/net/wireless/ath/ath9k/Makefile +++ b/drivers/net/wireless/ath/ath9k/Makefile | |||
@@ -14,9 +14,7 @@ ath9k-$(CONFIG_ATH9K_AHB) += ahb.o | |||
14 | ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o | 14 | ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o |
15 | ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o | 15 | ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o |
16 | ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += \ | 16 | ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += \ |
17 | dfs.o \ | 17 | dfs.o |
18 | dfs_pattern_detector.o \ | ||
19 | dfs_pri_detector.o | ||
20 | ath9k-$(CONFIG_PM_SLEEP) += wow.o | 18 | ath9k-$(CONFIG_PM_SLEEP) += wow.o |
21 | 19 | ||
22 | obj-$(CONFIG_ATH9K) += ath9k.o | 20 | obj-$(CONFIG_ATH9K) += ath9k.o |
diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h index 3c839f06a06a..c6fa3d5b5d74 100644 --- a/drivers/net/wireless/ath/ath9k/dfs.h +++ b/drivers/net/wireless/ath/ath9k/dfs.h | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #ifndef ATH9K_DFS_H | 18 | #ifndef ATH9K_DFS_H |
19 | #define ATH9K_DFS_H | 19 | #define ATH9K_DFS_H |
20 | #include "dfs_pattern_detector.h" | 20 | #include "../dfs_pattern_detector.h" |
21 | 21 | ||
22 | #if defined(CONFIG_ATH9K_DFS_CERTIFIED) | 22 | #if defined(CONFIG_ATH9K_DFS_CERTIFIED) |
23 | /** | 23 | /** |
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c index 990c37630725..90b8342d1ed4 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_debug.c +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | #include "ath9k.h" | 21 | #include "ath9k.h" |
22 | #include "dfs_debug.h" | 22 | #include "dfs_debug.h" |
23 | #include "dfs_pattern_detector.h" | 23 | #include "../dfs_pattern_detector.h" |
24 | 24 | ||
25 | static struct ath_dfs_pool_stats dfs_pool_stats = { 0 }; | 25 | static struct ath_dfs_pool_stats dfs_pool_stats = { 0 }; |
26 | 26 | ||
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c b/drivers/net/wireless/ath/dfs_pattern_detector.c index c230ffc2ddc7..a1a69c5db409 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c +++ b/drivers/net/wireless/ath/dfs_pattern_detector.c | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | #include "dfs_pattern_detector.h" | 20 | #include "dfs_pattern_detector.h" |
21 | #include "dfs_pri_detector.h" | 21 | #include "dfs_pri_detector.h" |
22 | #include "../ath.h" | 22 | #include "ath.h" |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * tolerated deviation of radar time stamp in usecs on both sides | 25 | * tolerated deviation of radar time stamp in usecs on both sides |
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h b/drivers/net/wireless/ath/dfs_pattern_detector.h index dde2652b787c..dde2652b787c 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h +++ b/drivers/net/wireless/ath/dfs_pattern_detector.h | |||
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c b/drivers/net/wireless/ath/dfs_pri_detector.c index 17b5bf9fd6a1..43b608178884 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.c +++ b/drivers/net/wireless/ath/dfs_pri_detector.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
18 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
19 | 19 | ||
20 | #include "../ath.h" | 20 | #include "ath.h" |
21 | #include "dfs_pattern_detector.h" | 21 | #include "dfs_pattern_detector.h" |
22 | #include "dfs_pri_detector.h" | 22 | #include "dfs_pri_detector.h" |
23 | 23 | ||
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h b/drivers/net/wireless/ath/dfs_pri_detector.h index 79f0fff4d1e6..79f0fff4d1e6 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_pri_detector.h +++ b/drivers/net/wireless/ath/dfs_pri_detector.h | |||