summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2416/irq.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-18 21:38:20 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-18 21:38:20 +0000
commitc592c761a36286ab83451daa37a21c8558ea99c0 (patch)
tree8abf57708fabf2a915320e9515b1ae2730ebf499 /arch/arm/mach-s3c2416/irq.c
parent63236f4038f7e14762114606d95769c32cf6cac1 (diff)
parent33499df88b711725ee473ab5478e17efd21de4b0 (diff)
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
Diffstat (limited to 'arch/arm/mach-s3c2416/irq.c')
-rw-r--r--arch/arm/mach-s3c2416/irq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c
index 36df761061de..fd49f35e448e 100644
--- a/arch/arm/mach-s3c2416/irq.c
+++ b/arch/arm/mach-s3c2416/irq.c
@@ -213,7 +213,8 @@ static int __init s3c2416_add_sub(unsigned int base,
return 0;
}
-static int __init s3c2416_irq_add(struct device *dev)
+static int __init s3c2416_irq_add(struct device *dev,
+ struct subsys_interface *sif)
{
printk(KERN_INFO "S3C2416: IRQ Support\n");