diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-15 12:11:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-15 12:11:51 +0100 |
| commit | e85d380710680cb5793fcb59e03b7904b07a1e19 (patch) | |
| tree | 6b65169c77da7fbaaf1ddc3fa53bf11c12064ea9 /arch/arm/mach-mx3/clock-imx35.c | |
| parent | 3d977c012f1af4a867939fa21ad502d5279fa0a0 (diff) | |
| parent | 679bfef0e366109483981899401b98b8a65ed06c (diff) | |
Merge branch 'for-rmk-rc' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx3/clock-imx35.c')
| -rw-r--r-- | arch/arm/mach-mx3/clock-imx35.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c index fe5c4217322..c595260ec1f 100644 --- a/arch/arm/mach-mx3/clock-imx35.c +++ b/arch/arm/mach-mx3/clock-imx35.c @@ -443,7 +443,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc-ehci.1", "usb", usbotg_clk) _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk) _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk) - _REGISTER_CLOCK("mxc_wdt.0", NULL, wdog_clk) + _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) _REGISTER_CLOCK(NULL, "max", max_clk) _REGISTER_CLOCK(NULL, "admux", admux_clk) _REGISTER_CLOCK(NULL, "csi", csi_clk) |