rsi: Add RS9113 wireless driver

This patch adds the Redpine Signals' 91x wireless driver.

Signed-off-by: Fariya Fatima <fariyaf@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 9c2c285..b2137e8 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -281,5 +281,6 @@ source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
 source "drivers/net/wireless/mwifiex/Kconfig"
 source "drivers/net/wireless/cw1200/Kconfig"
+source "drivers/net/wireless/rsi/Kconfig"
 
 endif # WLAN

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 0fab227..0c88916 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -59,3 +59,4 @@ obj-$(CONFIG_BRCMFMAC)        += brcm80211/
 obj-$(CONFIG_BRCMSMAC) += brcm80211/
 
 obj-$(CONFIG_CW1200)   += cw1200/
+obj-$(CONFIG_RSI_91X)  += rsi/

diff --cc drivers/net/wireless/rsi/Kconfig
Simple merge

diff --cc drivers/net/wireless/rsi/Makefile
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_core.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_debugfs.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_mac80211.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_main.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_mgmt.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_pkt.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_sdio.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_usb.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_91x_usb_ops.c
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_boot_params.h
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_common.h
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_debugfs.h
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_main.h
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_mgmt.h
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_sdio.h
Simple merge

diff --cc drivers/net/wireless/rsi/rsi_usb.h
Simple merge