diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 23:26:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 23:26:44 +0100 |
| commit | 6bf6d1af86e7dec914f7916f2a00910650a73469 (patch) | |
| tree | 7fb14c7fce10a9f3e5c48f49941b8642562017ec /arch/arm/mach-imx/clk-imx31.c | |
| parent | 45a690f6bcd5506d9988d0d069811ac9380750ad (diff) | |
| parent | 63f49dce39e5d6a19e5f1f9004eb48e73ba259e8 (diff) | |
| download | op-kernel-dev-6bf6d1af86e7dec914f7916f2a00910650a73469.zip op-kernel-dev-6bf6d1af86e7dec914f7916f2a00910650a73469.tar.gz | |
Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
Diffstat (limited to 'arch/arm/mach-imx/clk-imx31.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx31.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c index 8e19e70..1253af2 100644 --- a/arch/arm/mach-imx/clk-imx31.c +++ b/arch/arm/mach-imx/clk-imx31.c @@ -130,7 +130,7 @@ int __init mx31_clocks_init(unsigned long fref) clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0"); clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core"); clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb"); - clk_register_clkdev(clk[kpp_gate], "kpp", NULL); + clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad"); clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.0"); clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.0"); clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0"); |
