diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-20 10:11:08 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-20 10:11:08 -0800 |
| commit | 856c5403462419eff9a7891efeee7bddc2a08af6 (patch) | |
| tree | 2f4bb681e10ec1f895600fa0a4b0b177dadf6fb4 /arch/arm/mach-s3c2440/s3c244x-clock.c | |
| parent | b0ee4e394009f02a1d1b166091a19e8b842b4ea4 (diff) | |
| parent | d517110243130965e2803cc2373d434bdaf6dafb (diff) | |
Merge branch 'fixes-mmc' into fixes
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 b3fdbdda3d5..6d9b688c442 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; |