Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / mach-davinci / da850.c

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 04a58a3f38ad2db4932fcb05697c028e7cc8482b..aa37cbdf7d4d41bcd6987ccaa8fcdc48123efa23 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -563,8 +563,8 @@ static struct clk_lookup da850_clks[] = {
        CLK("da830-mmc.1",      NULL,           &mmcsd1_clk),
        CLK("ti-aemif",         NULL,           &aemif_clk),
        CLK("davinci-nand.0",   "aemif",        &aemif_nand_clk),
-       CLK("ohci-da8xx",       "usb11",        &usb11_clk),
-       CLK("musb-da8xx",       "usb20",        &usb20_clk),
+       CLK("ohci-da8xx",       NULL,           &usb11_clk),
+       CLK("musb-da8xx",       NULL,           &usb20_clk),
        CLK("cppi41-dmaengine", NULL,           &cppi41_clk),
        CLK("spi_davinci.0",    NULL,           &spi0_clk),
        CLK("spi_davinci.1",    NULL,           &spi1_clk),