diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 07:02:34 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 07:02:34 +0100 |
| commit | 02735a29d8ce882ec698803f064e17888874780c (patch) | |
| tree | 6a4afa3bc8b6d4334df24910a56f77adf126b0c7 /arch/arm/mach-at91/at91sam9260.c | |
| parent | Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'm... (diff) | |
| parent | Merge branch 'for-arnd-3.3-defconfig' of git://github.com/at91linux/linux-at9... (diff) | |
| download | linux-02735a29d8ce882ec698803f064e17888874780c.tar.xz linux-02735a29d8ce882ec698803f064e17888874780c.zip | |
Merge branch 'at91/defconfig' into next/cleanup
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 3f6c6a12480d..3a960d2740b6 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -196,9 +196,9 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), - CLKDEV_CON_DEV_ID("t3_clk", "atmel_tcb.1", &tc3_clk), - CLKDEV_CON_DEV_ID("t4_clk", "atmel_tcb.1", &tc4_clk), - CLKDEV_CON_DEV_ID("t5_clk", "atmel_tcb.1", &tc5_clk), + CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), + 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), /* more usart lookup table for DT entries */ CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), |