diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:43:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:43:31 -0700 |
| commit | 5170065d8af2c102ca940303416579606bc7ff51 (patch) | |
| tree | cdf113cb04be06d0d3afc8df06acc628208dbcdd /arch/mips/philips/pnx8550/common/int.c | |
| parent | ab8e823515305a93715e71b81efcbe27c6ce0f59 (diff) | |
| parent | c4710e65c005339b5979fa258bf89940dc2a700b (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Remove remaining reference to ite_gpio.h from Kbuild
[MIPS] PNX8550 fixups
Diffstat (limited to 'arch/mips/philips/pnx8550/common/int.c')
| -rw-r--r-- | arch/mips/philips/pnx8550/common/int.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c index 099679a9dfb..3c93512be1e 100644 --- a/arch/mips/philips/pnx8550/common/int.c +++ b/arch/mips/philips/pnx8550/common/int.c @@ -90,7 +90,7 @@ asmlinkage void plat_irq_dispatch(struct pt_regs *regs) unsigned int pending = read_c0_status() & read_c0_cause(); if (pending & STATUSF_IP2) - do_IRQ(2, regs); + hw0_irqdispatch(2, regs); else if (pending & STATUSF_IP7) { if (read_c0_config7() & 0x01c0) timer_irqdispatch(7, regs); |