diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 12:03:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 12:03:46 -0400 |
| commit | cdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (patch) | |
| tree | 18c4dcc07bbb8aeb2b23bc812cd60cc293f36cd8 /drivers/input/serio | |
| parent | bbc4fd12a635492ad9d12bb418124fa2d5f0d734 (diff) | |
| parent | 42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (79 commits)
powerpc/8xx: Add support for the MPC8xx based boards from TQC
powerpc/85xx: Introduce support for the Freescale P1022DS reference board
powerpc/85xx: Adding DTS for the STx GP3-SSA MPC8555 board
powerpc/85xx: Change deprecated binding for 85xx-based boards
powerpc/tqm85xx: add a quirk for ti1520 PCMCIA bridge
powerpc/tqm85xx: update PCI interrupt-map attribute
powerpc/mpc8308rdb: support for MPC8308RDB board from Freescale
powerpc/fsl_pci: add quirk for mpc8308 pcie bridge
powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
powerpc/85xx: Fix booting for P1021MDS boards
powerpc/85xx: Fix SWIOTLB initalization for MPC85xxMDS boards
powerpc/85xx: kexec for SMP 85xx BookE systems
powerpc/5200/i2c: improve i2c bus error recovery
of/xilinxfb: update tft compatible versions
powerpc/fsl-diu-fb: Support setting display mode using EDID
powerpc/5121: doc/dts-bindings: update doc of FSL DIU bindings
powerpc/5121: shared DIU framebuffer support
powerpc/5121: move fsl-diu-fb.h to include/linux
powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptor
powerpc/512x: add clock structure for Video-IN (VIU) unit
...
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-io.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h index 847f4aad7ed5..5d48bb66aa73 100644 --- a/drivers/input/serio/i8042-io.h +++ b/drivers/input/serio/i8042-io.h | |||
| @@ -27,6 +27,11 @@ | |||
| 27 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
| 28 | #elif defined(CONFIG_SH_CAYMAN) | 28 | #elif defined(CONFIG_SH_CAYMAN) |
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | #elif defined(CONFIG_PPC) | ||
| 31 | extern int of_i8042_kbd_irq; | ||
| 32 | extern int of_i8042_aux_irq; | ||
| 33 | # define I8042_KBD_IRQ of_i8042_kbd_irq | ||
| 34 | # define I8042_AUX_IRQ of_i8042_aux_irq | ||
| 30 | #else | 35 | #else |
| 31 | # define I8042_KBD_IRQ 1 | 36 | # define I8042_KBD_IRQ 1 |
| 32 | # define I8042_AUX_IRQ 12 | 37 | # define I8042_AUX_IRQ 12 |