diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:23:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:23:33 +0200 |
| commit | 1ba7055af26f008e8fc8dab9dcb1701534afbe16 (patch) | |
| tree | 6156556f56eba8ebc6d50639fbc8329f5ad078a2 /drivers/clk/ux500/u8500_clk.c | |
| parent | serial: imx: Improve Kconfig text (diff) | |
| parent | Linux 3.10-rc5 (diff) | |
| download | linux-1ba7055af26f008e8fc8dab9dcb1701534afbe16.tar.xz linux-1ba7055af26f008e8fc8dab9dcb1701534afbe16.zip | |
Merge 3.10-rc5 into tty-next
Diffstat (limited to 'drivers/clk/ux500/u8500_clk.c')
| -rw-r--r-- | drivers/clk/ux500/u8500_clk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c index 0b4f35a5ffc2..80069c370a47 100644 --- a/drivers/clk/ux500/u8500_clk.c +++ b/drivers/clk/ux500/u8500_clk.c @@ -325,7 +325,7 @@ void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", clkrst3_base, BIT(0), 0); clk_register_clkdev(clk, "fsmc", NULL); - clk_register_clkdev(clk, NULL, "smsc911x"); + clk_register_clkdev(clk, NULL, "smsc911x.0"); clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", clkrst3_base, BIT(1), 0); |