lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable

Browse Source 
Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c
This commit is contained in:
Russell King
2011-09-16 21:45:16 +01:00
parent 1db3706b05 4fb0d2ea39
commit 4722cd7741
106 changed files with 1507 additions and 1090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-imx/mach-cpuimx27.c
View File

@@ -310,7 +310,7 @@ static struct sys_timer eukrea_cpuimx27_timer = {
.init = eukrea_cpuimx27_timer_init,
};
MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")
.atag_offset = 0x100,
.map_io = mx27_map_io,
.init_early = imx27_init_early,