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.h | |
| 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.h')
| -rw-r--r-- | arch/powerpc/sysdev/cpm2_pic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/cpm2_pic.h b/arch/powerpc/sysdev/cpm2_pic.h index d63e45d4df5..3c513e5a688 100644 --- a/arch/powerpc/sysdev/cpm2_pic.h +++ b/arch/powerpc/sysdev/cpm2_pic.h @@ -3,7 +3,7 @@ extern intctl_cpm2_t *cpm2_intctl; -extern int cpm2_get_irq(struct pt_regs *regs); +extern unsigned int cpm2_get_irq(struct pt_regs *regs); extern void cpm2_pic_init(struct device_node*); |