diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 04:02:42 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 04:02:42 (GMT) |
commit | 1989425a3aed215f1accd5d8019b18b345166a63 (patch) | |
tree | edf01f8cddce137588a501d74eedb43e98911c62 /arch/powerpc/kernel/setup-common.c | |
parent | 0fc2f137226eff4c9dd90864dda5c237474c3ec5 (diff) | |
parent | e32e78c5ee8aadef020fbaecbe6fb741ed9029fd (diff) | |
download | linux-fsl-qoriq-1989425a3aed215f1accd5d8019b18b345166a63.tar.xz |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: fix build with make 3.82
Revert "Input: appletouch - fix integer overflow issue"
memblock: Fix memblock_is_region_reserved() to return a boolean
powerpc: Trim defconfigs
powerpc: fix i8042 module build error
sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset
powerpc/5200: add mpc5200_psc_ac97_gpio_reset
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 15ade0d..9d4882a 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -96,7 +96,9 @@ struct screen_info screen_info = { /* Variables required to store legacy IO irq routing */ int of_i8042_kbd_irq; +EXPORT_SYMBOL_GPL(of_i8042_kbd_irq); int of_i8042_aux_irq; +EXPORT_SYMBOL_GPL(of_i8042_aux_irq); #ifdef __DO_IRQ_CANON /* XXX should go elsewhere eventually */ |