Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 039920cc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'at91/fixes' of... 

Merge branch 'at91/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into fixes
parents 966843eb c0764b2a

arch/arm/mach-at91/at91sam9261.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),

	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", &tc1_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),