carl9170: Makefile, Kconfig files and MAINTAINERS

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 4a6d93648b9cf09b4309dc0e3c694c74cee7a83d..80cea03a737ea94b92226730b7d5d19d1c47debb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1102,6 +1102,13 @@ W:       http://wireless.kernel.org/en/users/Drivers/ar9170
 S:     Maintained
 F:     drivers/net/wireless/ath/ar9170/
 
+CARL9170 LINUX COMMUNITY WIRELESS DRIVER
+M:     Christian Lamparter <chunkeey@googlemail.com>
+L:     linux-wireless@vger.kernel.org
+W:     http://wireless.kernel.org/en/users/Drivers/carl9170
+S:     Maintained
+F:     drivers/net/wireless/ath/carl9170/
+
 ATK0110 HWMON DRIVER
 M:     Luca Tettamanti <kronos.it@gmail.com>
 L:     lm-sensors@lm-sensors.org

diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index 0a75be027afaa5c7604cfc257093979a636653ab..92c216263ee9d7304745f934c82e14dc3059f21b 100644 (file)
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -25,5 +25,6 @@ config ATH_DEBUG
 source "drivers/net/wireless/ath/ath5k/Kconfig"
 source "drivers/net/wireless/ath/ath9k/Kconfig"
 source "drivers/net/wireless/ath/ar9170/Kconfig"
+source "drivers/net/wireless/ath/carl9170/Kconfig"
 
 endif

diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile
index 8113a5042afac6e99904ab668b6a4491f901a363..40fa1794d489084987f509da9e9e80c824ac2b70 100644 (file)
--- a/drivers/net/wireless/ath/Makefile
+++ b/drivers/net/wireless/ath/Makefile
@@ -1,6 +1,7 @@
 obj-$(CONFIG_ATH5K)            += ath5k/
 obj-$(CONFIG_ATH9K_HW)         += ath9k/
 obj-$(CONFIG_AR9170_USB)        += ar9170/
+obj-$(CONFIG_CARL9170)         += carl9170/
 
 obj-$(CONFIG_ATH_COMMON)       += ath.o
 

diff --git a/drivers/net/wireless/ath/carl9170/Kconfig b/drivers/net/wireless/ath/carl9170/Kconfig
new file mode 100644 (file)
index 0000000..c5d3a3f
--- /dev/null
+++ b/drivers/net/wireless/ath/carl9170/Kconfig
@@ -0,0 +1,41 @@
+config CARL9170
+       tristate "Linux Community AR9170 802.11n USB support"
+       depends on USB && MAC80211 && EXPERIMENTAL
+       select FW_LOADER
+       select CRC32
+       help
+         This is another driver for the Atheros "otus" 802.11n USB devices.
+
+         This driver provides more features than the original,
+         but it needs a special firmware (carl9170-1.fw) to do that.
+
+         The firmware can be downloaded from our wiki here:
+         http://wireless.kernel.org/en/users/Drivers/carl9170
+
+         If you choose to build a module, it'll be called carl9170.
+
+config CARL9170_LEDS
+       bool "SoftLED Support"
+       depends on CARL9170
+       select MAC80211_LEDS
+       select LEDS_CLASS
+       select NEW_LEDS
+       default y
+       help
+         This option is necessary, if you want your device' LEDs to blink
+
+         Say Y, unless you need the LEDs for firmware debugging.
+
+config CARL9170_DEBUGFS
+       bool "DebugFS Support"
+       depends on CARL9170 && DEBUG_FS && MAC80211_DEBUGFS
+       default n
+       help
+         Export several driver and device internals to user space.
+
+         Say N.
+
+config CARL9170_WPC
+       bool
+       depends on CARL9170 && (INPUT = y || INPUT = CARL9170)
+       default y

diff --git a/drivers/net/wireless/ath/carl9170/Makefile b/drivers/net/wireless/ath/carl9170/Makefile
new file mode 100644 (file)
index 0000000..f64ed76
--- /dev/null
+++ b/drivers/net/wireless/ath/carl9170/Makefile
@@ -0,0 +1,4 @@
+carl9170-objs := main.o usb.o cmd.o mac.o phy.o led.o fw.o tx.o rx.o
+carl9170-$(CONFIG_CARL9170_DEBUGFS) += debug.o
+
+obj-$(CONFIG_CARL9170) += carl9170.o