diff options
| author | Dima Zavin <dima@android.com> | 2011-07-07 18:06:40 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-07-07 18:06:40 -0700 |
| commit | 3477238d80bf13520e70a2754da40300dd0c9b87 (patch) | |
| tree | 8217a0256038cba745abfcea94b6e16e74e8fb5e /arch/arm/mach-at91/at91cap9.c | |
| parent | e2aaaa9b5bd5c2d38c0c72b3b0d20f3c247eca61 (diff) | |
| parent | 814cdea670616252e4cdf297a07b02ce59698bf1 (diff) | |
| download | kernel_samsung_tuna-3477238d80bf13520e70a2754da40300dd0c9b87.zip kernel_samsung_tuna-3477238d80bf13520e70a2754da40300dd0c9b87.tar.gz kernel_samsung_tuna-3477238d80bf13520e70a2754da40300dd0c9b87.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/mach-at91/at91cap9.c')
| -rw-r--r-- | arch/arm/mach-at91/at91cap9.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index 17fae4a..f1013d0 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c @@ -223,15 +223,15 @@ static struct clk *periph_clocks[] __initdata = { }; static struct clk_lookup periph_clocks_lookups[] = { - CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc.0", &utmi_clk), - CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc.0", &udphs_clk), + CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk), + CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk), CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk), CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), - CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk), - CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), }; static struct clk_lookup usart_clocks_lookups[] = { |