Skip to content

Commit

Permalink
staging: brcm80211: Fix double include introduced by bad merge
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Morsing authored and Linus Torvalds committed Jul 27, 2011
1 parent e371d46 commit 8aae36c
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/brcm80211/brcmsmac/mac80211_if.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#define BRCMS_SET_SHORTSLOT_OVERRIDE 146


#include <linux/interrupt.h>

/* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and
* sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be
* submitted to workqueue instead of being on kernel timer
Expand Down

0 comments on commit 8aae36c

Please sign in to comment.