提交 8aae36cd 编写于 作者: D Daniel Morsing 提交者: Linus Torvalds

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: NDaniel Morsing <daniel.morsing@gmail.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 e371d46a
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册