diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 17:59:05 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 17:59:11 (GMT) |
| commit | a0008bf73c12212769b0d0b19cdec5c432de94ba (patch) | |
| tree | e53c67efd4aad97ab9f2addc1fc0d62879b41c55 /arch/arm/mach-s3c2440/clock.c | |
| parent | 5a8c271b26b83a09924c99aaa5c607021aed142b (diff) | |
| parent | cfac337b0fbcad5181096ab72bb24a05bd444562 (diff) | |
| download | linux-fsl-qoriq-a0008bf73c12212769b0d0b19cdec5c432de94ba.tar.xz | |
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/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c index bedbc87..414364e 100644 --- a/arch/arm/mach-s3c2440/clock.c +++ b/arch/arm/mach-s3c2440/clock.c @@ -149,7 +149,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = { CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n), }; -static int s3c2440_clk_add(struct device *dev) +static int s3c2440_clk_add(struct device *dev, struct subsys_interface *sif) { struct clk *clock_upll; struct clk *clock_h; |