git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu...
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-cpuimx27.c
diff --git
a/arch/arm/mach-imx/mach-cpuimx27.c
b/arch/arm/mach-imx/mach-cpuimx27.c
index
87887ac
..
f851fe9
100644
(file)
--- a/
arch/arm/mach-imx/mach-cpuimx27.c
+++ b/
arch/arm/mach-imx/mach-cpuimx27.c
@@
-310,7
+310,7
@@
static struct sys_timer eukrea_cpuimx27_timer = {
.init = eukrea_cpuimx27_timer_init,
};
.init = eukrea_cpuimx27_timer_init,
};
-MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
+MACHINE_START(
EUKREA_
CPUIMX27, "EUKREA CPUIMX27")
.boot_params = MX27_PHYS_OFFSET + 0x100,
.map_io = mx27_map_io,
.init_early = imx27_init_early,
.boot_params = MX27_PHYS_OFFSET + 0x100,
.map_io = mx27_map_io,
.init_early = imx27_init_early,