diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
| commit | b618f6f885579a6237e5bf4582fa6167972ddef4 (patch) | |
| tree | b11508178570b98ce9cb2d76ecebd046a6f0e77c /drivers/net/wireless/ath/Kconfig | |
| parent | 462fb2af9788a82a534f8184abfde31574e1cfa0 (diff) | |
| parent | 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
arch/arm/mach-omap2/board-omap3pandora.c
drivers/net/wireless/ath/ath5k/base.c
Diffstat (limited to 'drivers/net/wireless/ath/Kconfig')
| -rw-r--r-- | drivers/net/wireless/ath/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig index 0a75be027afa..92c216263ee9 100644 --- a/drivers/net/wireless/ath/Kconfig +++ b/drivers/net/wireless/ath/Kconfig | |||
| @@ -25,5 +25,6 @@ config ATH_DEBUG | |||
| 25 | source "drivers/net/wireless/ath/ath5k/Kconfig" | 25 | source "drivers/net/wireless/ath/ath5k/Kconfig" |
| 26 | source "drivers/net/wireless/ath/ath9k/Kconfig" | 26 | source "drivers/net/wireless/ath/ath9k/Kconfig" |
| 27 | source "drivers/net/wireless/ath/ar9170/Kconfig" | 27 | source "drivers/net/wireless/ath/ar9170/Kconfig" |
| 28 | source "drivers/net/wireless/ath/carl9170/Kconfig" | ||
| 28 | 29 | ||
| 29 | endif | 30 | endif |