diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-03-06 00:37:04 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-03-06 00:37:04 +0100 |
| commit | 015f1e4297ad32f83251f3f4cee2389ce5516e9e (patch) | |
| tree | 1b16e317005dc3d09b0551a4db9182f7f4119f71 /arch/arm/mach-s3c2440/s3c244x-clock.c | |
| parent | ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes (diff) | |
| parent | ARM: OMAP: convert omap_device_build() and callers to __init (diff) | |
| download | linux-015f1e4297ad32f83251f3f4cee2389ce5516e9e.tar.xz linux-015f1e4297ad32f83251f3f4cee2389ce5516e9e.zip | |
Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c244x-clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c244x-clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/s3c244x-clock.c b/arch/arm/mach-s3c2440/s3c244x-clock.c index b3fdbdda3d5f..6d9b688c442b 100644 --- a/arch/arm/mach-s3c2440/s3c244x-clock.c +++ b/arch/arm/mach-s3c2440/s3c244x-clock.c @@ -72,7 +72,7 @@ static struct clk clk_arm = { }, }; -static int s3c244x_clk_add(struct device *dev) +static int s3c244x_clk_add(struct device *dev, struct subsys_interface *sif) { unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN); unsigned long clkdivn; |