diff options
| author | Daniel Morsing <daniel.morsing@gmail.com> | 2011-07-27 07:53:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 12:23:35 -0400 |
| commit | 8aae36cdf12313cd9cc0e4799fe1ea64d3c623f3 (patch) | |
| tree | 40a225a7183d0fcbbc9762602673b0fd6232c0b0 /drivers/staging | |
| parent | e371d46ae45488bcb112a99a7de462e9e3aa6764 (diff) | |
staging: brcm80211: Fix double include introduced by bad merge
A merge with Linus' tree added a double include of linux/interrupt.h.
Fix by removing one of the includes.
Signed-off-by: Daniel Morsing <daniel.morsing@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h index 5711e7c16b50..40e3d375ea99 100644 --- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h +++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h | |||
| @@ -24,8 +24,6 @@ | |||
| 24 | #define BRCMS_SET_SHORTSLOT_OVERRIDE 146 | 24 | #define BRCMS_SET_SHORTSLOT_OVERRIDE 146 |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | #include <linux/interrupt.h> | ||
| 28 | |||
| 29 | /* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and | 27 | /* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and |
| 30 | * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be | 28 | * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be |
| 31 | * submitted to workqueue instead of being on kernel timer | 29 | * submitted to workqueue instead of being on kernel timer |