diff options
author | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
---|---|---|
committer | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
commit | edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch) | |
tree | 61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /arch/arm/mach-at91/at91sam9260.c | |
parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
parent | Linux 3.7-rc4 (diff) | |
download | kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.gz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.xz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.zip |
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index ad29f93f20ca..f8202615f4a8 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -211,8 +211,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk), - CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260", &twi_clk), - CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi_clk), /* more usart lookup table for DT entries */ CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk), |