summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2440/s3c2442.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-27 17:59:05 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-27 17:59:11 +0000
commita0008bf73c12212769b0d0b19cdec5c432de94ba (patch)
treee53c67efd4aad97ab9f2addc1fc0d62879b41c55 /arch/arm/mach-s3c2440/s3c2442.c
parent5a8c271b26b83a09924c99aaa5c607021aed142b (diff)
parentcfac337b0fbcad5181096ab72bb24a05bd444562 (diff)
Merge branch 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6 into next/fixes-non-critical
* 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6: (1 commit) ARM: LPC32xx: Fix missing and bad LPC32XX macros Update to Linux 3.3-rc5 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c2442.c')
-rw-r--r--arch/arm/mach-s3c2440/s3c2442.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c
index 8004e0497bf4..22cb7c94a8c8 100644
--- a/arch/arm/mach-s3c2440/s3c2442.c
+++ b/arch/arm/mach-s3c2440/s3c2442.c
@@ -122,7 +122,7 @@ static struct clk s3c2442_clk_cam_upll = {
},
};
-static int s3c2442_clk_add(struct device *dev)
+static int s3c2442_clk_add(struct device *dev, struct subsys_interface *sif)
{
struct clk *clock_upll;
struct clk *clock_h;