]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e1fa66e) | patch
staging: brcm80211: Fix double include introduced by bad merge
authorDaniel Morsing <daniel.morsing@gmail.com>
Wed, 27 Jul 2011 11:53:28 +0000 (13:53 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jul 2011 16:23:35 +0000 (09:23 -0700)
commit2260b69d0bc4229de51eb5c2daaa712f0b4f60a5
tree40a225a7183d0fcbbc9762602673b0fd6232c0b0tree | snapshot
parente1fa66e5f7e457f96138a07929fb47a3363c4e7ccommit | 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>
drivers/staging/brcm80211/brcmsmac/mac80211_if.h diff | blob | history
Linux Kernel Source Tree.