sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'spear/dt' into spear/clock

Browse Source 
Conflicts:
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear3xx/include/mach/misc_regs.h
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear6xx/clock.c
	arch/arm/mach-spear6xx/include/mach/misc_regs.h

Resolve even more merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2012-05-14 17:31:45 +02:00
parent d2819f80d4 f613e220ae
commit 66a2886d86
35 changed files with 464 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-spear3xx/spear3xx.c
View File

@@ -21,7 +21,7 @@
#include <asm/hardware/vic.h>
#include <plat/pl080.h>
#include <mach/generic.h>
#include <mach/hardware.h>
#include <mach/spear.h>
/* ssp device registration */
struct pl022_ssp_controller pl022_plat_data = {
@@ -111,7 +111,7 @@ static void __init spear3xx_timer_init(void)
clk_put(gpt_clk);
clk_put(pclk);
spear_setup_timer();
spear_setup_of_timer();
}
struct sys_timer spear3xx_timer = {