[PATCH] genirq: Fixup ARM devel merge
authorThomas Gleixner <tglx@linutronix.de>
Mon, 3 Jul 2006 00:22:22 +0000 (02:22 +0200)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Jul 2006 00:29:57 +0000 (17:29 -0700)
commit29454dde27d8e340bb1987bad9aa504af7081eba
tree62d872171a9c3468b9240d2ebe8465687bf931d6
parentbb8d5a55a523869ebcdd004a08ed5fab86b474e3
[PATCH] genirq: Fixup ARM devel merge

ARM devel merge introduced new machine functionality which was not
covered by the ARM -> genirq patches. Fix it up and make it compile
again.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/arm/plat-omap/gpio.c