Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / ath / ath5k / Kconfig

diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
index eb83b7b4d0e3c96339b114166c26adbc5a164c11..e0793319389d19a7aa27b52a3346f30bb68366cc 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -1,9 +1,12 @@
 config ATH5K
        tristate "Atheros 5xxx wireless cards support"
-       depends on PCI && MAC80211
+       depends on (PCI || ATHEROS_AR231X) && MAC80211
        select MAC80211_LEDS
        select LEDS_CLASS
        select NEW_LEDS
+       select AVERAGE
+       select ATH5K_AHB if (ATHEROS_AR231X && !PCI)
+       select ATH5K_PCI if (!ATHEROS_AR231X && PCI)
        ---help---
          This module adds support for wireless adapters based on
          Atheros 5xxx chipset.
@@ -37,3 +40,16 @@ config ATH5K_DEBUG
 
          modprobe ath5k debug=0x00000400
 
+config ATH5K_AHB
+       bool "Atheros 5xxx AHB bus support"
+       depends on (ATHEROS_AR231X && !PCI)
+       ---help---
+         This adds support for WiSoC type chipsets of the 5xxx Atheros
+         family.
+
+config ATH5K_PCI
+       bool "Atheros 5xxx PCI bus support"
+       depends on (!ATHEROS_AR231X && PCI)
+       ---help---
+         This adds support for PCI type chipsets of the 5xxx Atheros
+         family.