summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/cpm2_pic.c
diff options
context:
space:
mode:
authorVitaly Bordug <vbordug@ru.mvista.com>2006-10-02 22:41:50 +0400
committerVitaly Bordug <vbordug@ru.mvista.com>2006-10-03 21:36:00 +0400
commited943c1faba53d9a0bde56007ee27762b29dccbd (patch)
tree3749e45c7ecc20a134b4d9230d21108c1b102fc8 /arch/powerpc/sysdev/cpm2_pic.c
parente02f73e9fd69f1c6d16c207f7a91ce721fe8beab (diff)
downloadblackbird-op-linux-ed943c1faba53d9a0bde56007ee27762b29dccbd.tar.gz
blackbird-op-linux-ed943c1faba53d9a0bde56007ee27762b29dccbd.zip
POWERPC: 8272ads merge to powerpc: common stuff
This has modules of common directories related to the mpc8272ADS board, mainly common cpm2 changes and fsl_soc.c portions related to the bitbang MDIO and other mechanisms specific for this family. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Diffstat (limited to 'arch/powerpc/sysdev/cpm2_pic.c')
-rw-r--r--arch/powerpc/sysdev/cpm2_pic.c2
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;
OpenPOWER on IntegriCloud