projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'depends/rmk/memory_h' into next/fixes
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-imx
/
mach-cpuimx35.c
diff --git
a/arch/arm/mach-imx/mach-cpuimx35.c
b/arch/arm/mach-imx/mach-cpuimx35.c
index 10b89139da4853961a745ede3f0f48f47d5ea034..470b654b0e6eef12cba24b29d34faf112e3fa5c9 100644
(file)
--- a/
arch/arm/mach-imx/mach-cpuimx35.c
+++ b/
arch/arm/mach-imx/mach-cpuimx35.c
@@
-192,7
+192,7
@@
struct sys_timer eukrea_cpuimx35_timer = {
.init = eukrea_cpuimx35_timer_init,
};
-MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
+MACHINE_START(EUKREA_CPUIMX35
SD
, "Eukrea CPUIMX35")
/* Maintainer: Eukrea Electromatique */
.atag_offset = 0x100,
.map_io = mx35_map_io,