diff options
| -rw-r--r-- | drivers/net/wireless/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/Makefile | 4 | ||||
| -rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_pm.c | 8 |
3 files changed, 6 insertions, 9 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 diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c index 1e0ace8b6d13..1bf1a5ae9693 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c @@ -1,6 +1,6 @@ /* * - * Copyright (c) 2004-2010 Atheros Communications Inc. + * Copyright (c) 2004-2011 Atheros Communications Inc. * All rights reserved. * * @@ -267,7 +267,11 @@ int ar6000_resume_ev(void *context) AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Strange SDIO bus power mode!!\n")); break; } - return 0; +#ifdef CONFIG_HAS_WAKELOCK + wake_unlock(&ar6k_suspend_wake_lock); +#endif + mdelay(100); + return A_OK; } void ar6000_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bool isEvent) |