summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorTony Lin <tony.lin@freescale.com>2011-08-22 19:50:19 +0800
committerJason Liu <r64343@freescale.com>2012-07-20 13:15:34 +0800
commit32a002073901aaae9f8bf19028e515fd91b775e7 (patch)
tree1faf41565ed921ac3d27d88449c575be41e5e4d7 /drivers/net
parent801b7e6c5b230674c4491888b8516efaecdbcc18 (diff)
ENGR00139260-2 [ath6k wifi]add some delay after resuming
add some delay after resuming. Signed-off-by: Tony Lin <tony.lin@freescale.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/Kconfig3
-rw-r--r--drivers/net/wireless/Makefile4
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index a8bc7cc8599c..fbcf8613463b 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -284,11 +284,8 @@ 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"
->>>>>>> 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 d555677cf9e4..60a0a417b21f 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -57,9 +57,5 @@ 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/
->>>>>>> ENGR00139260-1 [ath6k wifi]remove drivers under drivers/net/wireless