diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-03-25 08:44:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-03-25 08:44:12 +0100 |
| commit | 0491fcbb76339cecbe4b6b1e862fb0c166bacf2d (patch) | |
| tree | bedf421a0ccabbef074460c36d8129eed43c0d7e /arch/arm/mach-mx5/clock-mx51.c | |
| parent | ae7a3f13ab59784d9d5041d8ecb08477a049e2c6 (diff) | |
| parent | fc300206ad07e771ed003d35b1dc179eaf0c508f (diff) | |
| download | kernel_samsung_smdk4412-0491fcbb76339cecbe4b6b1e862fb0c166bacf2d.zip kernel_samsung_smdk4412-0491fcbb76339cecbe4b6b1e862fb0c166bacf2d.tar.gz kernel_samsung_smdk4412-0491fcbb76339cecbe4b6b1e862fb0c166bacf2d.tar.bz2 | |
Merge branch 'mx51' into mxc-rc
Diffstat (limited to 'arch/arm/mach-mx5/clock-mx51.c')
| -rw-r--r-- | arch/arm/mach-mx5/clock-mx51.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51.c b/arch/arm/mach-mx5/clock-mx51.c index be90c03..8f85f73 100644 --- a/arch/arm/mach-mx5/clock-mx51.c +++ b/arch/arm/mach-mx5/clock-mx51.c @@ -757,7 +757,7 @@ DEFINE_CLOCK(uart3_ipg_clk, 2, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG7_OFFSET, /* GPT */ DEFINE_CLOCK(gpt_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG9_OFFSET, - NULL, NULL, &ipg_perclk, NULL); + NULL, NULL, &ipg_clk, NULL); DEFINE_CLOCK(gpt_ipg_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG10_OFFSET, NULL, NULL, &ipg_clk, NULL); |