diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 19:16:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 19:16:33 -0400 |
| commit | 3c693024cffa5c96a20b969f4efd058675e7700f (patch) | |
| tree | 2e49a90c3e67a898770fe0ea735d00326dbe3f69 /arch/ppc/syslib/mpc52xx_pic.c | |
| parent | 107c3a73e0ee037322efa00fa3cb45b3b7eb6069 (diff) | |
| parent | 10270613fb4d5a44c335cfa13e9626bf5743c01d (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix windfarm platform device usage
[POWERPC] Fix i2c-powermac platform device usage
[POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs
[POWERPC] ARCH=ppc pt_regs fixes
[POWERPC] Update maple defconfig
[POWERPC] Fix Maple secondary IDE interrupt
[POWERPC] Make U4 PCIe work on maple
[POWERPC] cell: fix default zImage build target
[POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces
[POWERPC] Fix xmon IRQ handler for pt_regs removal
Diffstat (limited to 'arch/ppc/syslib/mpc52xx_pic.c')
| -rw-r--r-- | arch/ppc/syslib/mpc52xx_pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/mpc52xx_pic.c b/arch/ppc/syslib/mpc52xx_pic.c index 6425b5cee7db..af35a316544a 100644 --- a/arch/ppc/syslib/mpc52xx_pic.c +++ b/arch/ppc/syslib/mpc52xx_pic.c | |||
| @@ -220,7 +220,7 @@ mpc52xx_init_irq(void) | |||
| 220 | } | 220 | } |
| 221 | 221 | ||
| 222 | int | 222 | int |
| 223 | mpc52xx_get_irq(struct pt_regs *regs) | 223 | mpc52xx_get_irq(void) |
| 224 | { | 224 | { |
| 225 | u32 status; | 225 | u32 status; |
| 226 | int irq = -1; | 226 | int irq = -1; |