summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2443/irq.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-02-27 14:04:40 -0700
committerGrant Likely <grant.likely@secretlab.ca>2012-02-27 14:04:40 -0700
commit29f141fed01a09050207c4d41fc5811520d81146 (patch)
treec55a51dca4a0e4da9fdc2b904eefbde37d2a5b03 /arch/arm/mach-s3c2443/irq.c
parent2261cc627f5453004042b4f694612edae27e492e (diff)
parent14cd3c15cfc8118586262a79bfa3b3123f13e2c2 (diff)
downloadop-kernel-dev-29f141fed01a09050207c4d41fc5811520d81146.zip
op-kernel-dev-29f141fed01a09050207c4d41fc5811520d81146.tar.gz
Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
Diffstat (limited to 'arch/arm/mach-s3c2443/irq.c')
-rw-r--r--arch/arm/mach-s3c2443/irq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c
index 35e4ff2..ac2829f 100644
--- a/arch/arm/mach-s3c2443/irq.c
+++ b/arch/arm/mach-s3c2443/irq.c
@@ -241,7 +241,8 @@ static int __init s3c2443_add_sub(unsigned int base,
return 0;
}
-static int __init s3c2443_irq_add(struct device *dev)
+static int __init s3c2443_irq_add(struct device *dev,
+ struct subsys_interface *sif)
{
printk("S3C2443: IRQ Support\n");
OpenPOWER on IntegriCloud