diff options
author | Christian Lamparter <chunkeey@web.de> | 2009-03-21 18:11:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-03-27 20:13:09 -0400 |
commit | 75ca88c9701bf8f65fc1f009f10dd64b0378b977 (patch) | |
tree | 501a6154c34ad902b0369d81efca6a97dbee7115 | |
parent | b63a2cb30405777033d58045c562a3b04d87d702 (diff) |
ar9170: update Makefile, Kconfig and MAINTAINERS
This patch update all necessary Makefile and Kconfig files.
Now you can then enable ar9170 in the kernel configuration under:
Device Drivers --->
[*] Network device support --->
Wireless LAN --->
[*] Wireless LAN (IEEE 802.11)
<M> Atheros AR9170 support
<M> Atheros AR9170 USB support
Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | MAINTAINERS | 8 | ||||
-rw-r--r-- | drivers/net/wireless/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/wireless/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ar9170/Kconfig | 28 | ||||
-rw-r--r-- | drivers/net/wireless/ar9170/Makefile | 5 |
5 files changed, 43 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bdadcb3c3f48..64c89c215b01 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -765,6 +765,14 @@ L: linux-wireless@vger.kernel.org | |||
765 | L: ath9k-devel@lists.ath9k.org | 765 | L: ath9k-devel@lists.ath9k.org |
766 | S: Supported | 766 | S: Supported |
767 | 767 | ||
768 | ATHEROS AR9170 WIRELESS DRIVER | ||
769 | P: Christian Lamparter | ||
770 | M: chunkeey@web.de | ||
771 | L: linux-wireless@vger.kernel.org | ||
772 | W: http://wireless.kernel.org/en/users/Drivers/ar9170 | ||
773 | S: Maintained | ||
774 | F: drivers/net/wireless/ar9170/ | ||
775 | |||
768 | ATI_REMOTE2 DRIVER | 776 | ATI_REMOTE2 DRIVER |
769 | P: Ville Syrjala | 777 | P: Ville Syrjala |
770 | M: syrjala@sci.fi | 778 | M: syrjala@sci.fi |
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 612fffe100a6..8a0823588c51 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
@@ -485,6 +485,7 @@ config MWL8K | |||
485 | source "drivers/net/wireless/p54/Kconfig" | 485 | source "drivers/net/wireless/p54/Kconfig" |
486 | source "drivers/net/wireless/ath5k/Kconfig" | 486 | source "drivers/net/wireless/ath5k/Kconfig" |
487 | source "drivers/net/wireless/ath9k/Kconfig" | 487 | source "drivers/net/wireless/ath9k/Kconfig" |
488 | source "drivers/net/wireless/ar9170/Kconfig" | ||
488 | source "drivers/net/wireless/ipw2x00/Kconfig" | 489 | source "drivers/net/wireless/ipw2x00/Kconfig" |
489 | source "drivers/net/wireless/iwlwifi/Kconfig" | 490 | source "drivers/net/wireless/iwlwifi/Kconfig" |
490 | source "drivers/net/wireless/hostap/Kconfig" | 491 | source "drivers/net/wireless/hostap/Kconfig" |
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index d780487c420f..5e7c9acb6bec 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
@@ -57,5 +57,6 @@ obj-$(CONFIG_P54_COMMON) += p54/ | |||
57 | 57 | ||
58 | obj-$(CONFIG_ATH5K) += ath5k/ | 58 | obj-$(CONFIG_ATH5K) += ath5k/ |
59 | obj-$(CONFIG_ATH9K) += ath9k/ | 59 | obj-$(CONFIG_ATH9K) += ath9k/ |
60 | obj-$(CONFIG_AR9170_COMMON) += ar9170/ | ||
60 | 61 | ||
61 | obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o | 62 | obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o |
diff --git a/drivers/net/wireless/ar9170/Kconfig b/drivers/net/wireless/ar9170/Kconfig new file mode 100644 index 000000000000..f6611876e285 --- /dev/null +++ b/drivers/net/wireless/ar9170/Kconfig | |||
@@ -0,0 +1,28 @@ | |||
1 | config AR9170_COMMON | ||
2 | tristate "Atheros AR9170 support" | ||
3 | depends on WLAN_80211 && MAC80211 && EXPERIMENTAL | ||
4 | help | ||
5 | This is common code for AR9170 based devices. | ||
6 | This module does nothing by itself - the USB/(SPI) frontends | ||
7 | also need to be enabled in order to support any devices. | ||
8 | |||
9 | Say Y if you have the hardware, or M to build a module called | ||
10 | ar9170common. | ||
11 | |||
12 | config AR9170_USB | ||
13 | tristate "Atheros AR9170 USB support" | ||
14 | depends on AR9170_COMMON && USB | ||
15 | select FW_LOADER | ||
16 | help | ||
17 | This is a driver for the Atheros "otus" 802.11n USB devices. | ||
18 | |||
19 | These devices require additional firmware (2 files). | ||
20 | For now, these files can be downloaded from here: | ||
21 | http://wireless.kernel.org/en/users/Drivers/ar9170 | ||
22 | |||
23 | If you choose to build a module, it'll be called ar9170usb. | ||
24 | |||
25 | config AR9170_LEDS | ||
26 | bool | ||
27 | depends on AR9170_COMMON && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = AR9170_COMMON) | ||
28 | default y | ||
diff --git a/drivers/net/wireless/ar9170/Makefile b/drivers/net/wireless/ar9170/Makefile new file mode 100644 index 000000000000..59b174dd466a --- /dev/null +++ b/drivers/net/wireless/ar9170/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | ar9170common-objs += main.o cmd.o mac.o phy.o led.o | ||
2 | ar9170usb-objs += usb.o | ||
3 | |||
4 | obj-$(CONFIG_AR9170_COMMON) += ar9170common.o | ||
5 | obj-$(CONFIG_AR9170_USB) += ar9170usb.o | ||