diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-03 15:16:34 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-03 15:16:34 -0500 |
| commit | 57adc1fcbae2c13104ce291b40f23e40a414fa87 (patch) | |
| tree | a22d95cd3a96cbd515cd24fb0833739576c5e92f /drivers/net/wireless/ath/ath9k/dfs_debug.h | |
| parent | faa85aa24286a9e14ae7cc797352350c3ac39986 (diff) | |
| parent | dc0d633e35643662f27a0b1c531da3cd6b204b9c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/dfs_debug.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs_debug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h index 6e1e2a71659..4911724cb44 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_debug.h +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | #ifndef DFS_DEBUG_H | 19 | #ifndef ATH9K_DFS_DEBUG_H |
| 20 | #define DFS_DEBUG_H | 20 | #define ATH9K_DFS_DEBUG_H |
| 21 | 21 | ||
| 22 | #include "hw.h" | 22 | #include "hw.h" |
| 23 | 23 | ||
| @@ -54,4 +54,4 @@ static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { } | |||
| 54 | 54 | ||
| 55 | #endif /* CONFIG_ATH9K_DFS_DEBUGFS */ | 55 | #endif /* CONFIG_ATH9K_DFS_DEBUGFS */ |
| 56 | 56 | ||
| 57 | #endif /* DFS_DEBUG_H */ | 57 | #endif /* ATH9K_DFS_DEBUG_H */ |