diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-26 11:34:00 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-26 11:34:00 -0400 |
| commit | 039920ccdde7b678adcc554cbb39f185080ce2e5 (patch) | |
| tree | c976d5f2d68e6672cbc311294e3c4fe6b95c57ba /arch/arm | |
| parent | 966843eb43cf90b1c6d3f56ecc96832bf6fb4b8f (diff) | |
| parent | c0764b2a4cdc41779460eb8796bc76e4fbddf339 (diff) | |
Merge branch 'at91/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into fixes
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index d522b47e30b5..6c8e3b5f669f 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
| @@ -157,7 +157,7 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
| 157 | CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), | 157 | CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), |
| 158 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), | 158 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), |
| 159 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), | 159 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), |
| 160 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc1_clk), | 160 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), |
| 161 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), | 161 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), |
| 162 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), | 162 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), |
| 163 | CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), | 163 | CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), |