diff options
| author | Tony Lin <tony.lin@freescale.com> | 2011-08-22 19:48:55 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 20:23:21 +0800 |
| commit | 5972fa8704be2e89cc7189dda9bde41065e02ddf (patch) | |
| tree | 5c8863006a24b455e5dac12947327057e2687935 /drivers/net | |
| parent | 7a9ec5bf76999f05431e7048491344ed2954a3a8 (diff) | |
ENGR00139260-1 [ath6k wifi]remove drivers under drivers/net/wireless
instead we will use ath6k driver under drivers/staging
Signed-off-by: Tony Lin <tony.lin@freescale.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/Makefile | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index e8e1fbc25a00..a8bc7cc8599c 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -284,7 +284,11 @@ source "drivers/net/wireless/rtlwifi/Kconfig" source "drivers/net/wireless/wl1251/Kconfig" source "drivers/net/wireless/wl12xx/Kconfig" source "drivers/net/wireless/zd1211rw/Kconfig" +<<<<<<< HEAD source "drivers/net/wireless/mwifiex/Kconfig" -source "drivers/net/wireless/ath6kl/Kconfig" +#source "drivers/net/wireless/ath6kl/Kconfig" +======= +#source "drivers/net/wireless/ath6kl/Kconfig" +>>>>>>> ENGR00139260-1 [ath6k wifi]remove drivers under drivers/net/wireless endif # WLAN diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index a9ba769ca783..d555677cf9e4 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -57,5 +57,9 @@ obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/ obj-$(CONFIG_IWM) += iwmc3200wifi/ +<<<<<<< HEAD obj-$(CONFIG_MWIFIEX) += mwifiex/ -obj-$(CONFIG_ATH6K_LEGACY) += ath6kl/ +#obj-$(CONFIG_ATH6K_LEGACY) += ath6kl/ +======= +#obj-$(CONFIG_ATH6K_LEGACY) += ath6kl/ +>>>>>>> ENGR00139260-1 [ath6k wifi]remove drivers under drivers/net/wireless |