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 branch 'btrfs-3.0' of git://github.com/chrismason/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-eukrea_cpuimx25.c
diff --git
a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index
da36da5
..
2442d5d
100644
(file)
--- a/
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@
-161,7
+161,7
@@
static struct sys_timer eukrea_cpuimx25_timer = {
.init = eukrea_cpuimx25_timer_init,
};
-MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
+MACHINE_START(EUKREA_CPUIMX25
SD
, "Eukrea CPUIMX25")
/* Maintainer: Eukrea Electromatique */
.boot_params = MX25_PHYS_OFFSET + 0x100,
.map_io = mx25_map_io,