diff options
| author |   Kalle Valo <kvalo@qca.qualcomm.com> | 2012-06-14 14:20:18 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-06-14 14:44:49 +0300 |
| commit | d987dd137bac8dca9b0015763d3106f48bb8a596 (patch) | |
| tree | ef887505b3c904c548d58ec9bb6f4970a0877042 /include/linux/wait.h | |
| parent | ath6kl: fix fw capability parsing (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (diff) | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
Diffstat (limited to 'include/linux/wait.h')
| -rw-r--r-- | include/linux/wait.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index 7d9a9e990ce6..1dee81c41ff1 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -22,7 +22,6 @@ #include <linux/list.h> #include <linux/stddef.h> #include <linux/spinlock.h> -#include <asm/system.h> #include <asm/current.h> typedef struct __wait_queue wait_queue_t; |