]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
ath9k: fixup some merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Oct 2008 20:16:38 +0000 (16:16 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Oct 2008 20:16:38 +0000 (16:16 -0400)
commit8ec8ebaeceedf3a845f9e23885f26d0d00eefeb7
treec1db9bf03204b34c46e251fd602f0708da6b3737
parentc7004482e8dcb7c3c72666395cfa98a216a4fb70
ath9k: fixup some merge damage

This hunk was originally removed as part of "ath9k: Fix IRQ nobody cared
issue with ath9k".

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath9k/core.c