diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 19:07:48 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 19:07:48 (GMT) |
| commit | a26361a77edc724492558a458af6c19cf821ab87 (patch) | |
| tree | 66291bef8d4f7f5b682b588ae47950cab024eeeb | |
| parent | 14070ade02cc378bc30dae383532768a94805988 (diff) | |
| parent | 1d818efd2949b5874eaf2531585e1f0735a7db91 (diff) | |
| download | linux-a26361a77edc724492558a458af6c19cf821ab87.tar.xz | |
Merge branch 'imx/cleanup-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
From Shawn Guo <shawn.guo@linaro.org>:
* 'imx/cleanup-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx6q: remove unneeded clkdev lookups
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index e1a17ac..abb42e7 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -388,12 +388,9 @@ int __init mx6q_clocks_init(void) pr_err("i.MX6q clk %d: register failed with %ld\n", i, PTR_ERR(clk[i])); - clk_register_clkdev(clk[mmdc_ch0_axi], NULL, "mmdc_ch0_axi"); - clk_register_clkdev(clk[mmdc_ch1_axi], NULL, "mmdc_ch1_axi"); clk_register_clkdev(clk[gpt_ipg], "ipg", "imx-gpt.0"); clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0"); clk_register_clkdev(clk[twd], NULL, "smp_twd"); - clk_register_clkdev(clk[usboh3], NULL, "usboh3"); clk_register_clkdev(clk[uart_serial], "per", "2020000.serial"); clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.serial"); clk_register_clkdev(clk[uart_serial], "per", "21e8000.serial"); |