diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-10-04 15:20:34 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-04 15:20:34 +1000 |
| commit | 5a3e3b2230980cf2ce6e5e56b816dde19b993939 (patch) | |
| tree | a3c344211e30c7e0c601b53bef6473069c08ac8a /arch/powerpc/sysdev/cpm2_pic.c | |
| parent | c730f5b621afa33e9f4939da9078669162ebff4e (diff) | |
| parent | 91bd61099defb28a442db358dd9c1693c6589cee (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ
Diffstat (limited to 'arch/powerpc/sysdev/cpm2_pic.c')
| -rw-r--r-- | arch/powerpc/sysdev/cpm2_pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c index 51752990f7b9..28b018994746 100644 --- a/arch/powerpc/sysdev/cpm2_pic.c +++ b/arch/powerpc/sysdev/cpm2_pic.c @@ -147,7 +147,7 @@ static struct irq_chip cpm2_pic = { .end = cpm2_end_irq, }; -int cpm2_get_irq(struct pt_regs *regs) +unsigned int cpm2_get_irq(struct pt_regs *regs) { int irq; unsigned long bits; |