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 tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
setup-r7s72100.c
diff --git
a/arch/arm/mach-shmobile/setup-r7s72100.c
b/arch/arm/mach-shmobile/setup-r7s72100.c
index
46a93f7
..
4122104
100644
(file)
--- a/
arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/
arch/arm/mach-shmobile/setup-r7s72100.c
@@
-24,7
+24,6
@@
#include "common.h"
-#ifdef CONFIG_USE_OF
static const char *r7s72100_boards_compat_dt[] __initdata = {
"renesas,r7s72100",
NULL,
@@
-35,4
+34,3
@@
DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
.init_late = shmobile_init_late,
.dt_compat = r7s72100_boards_compat_dt,
MACHINE_END
-#endif /* CONFIG_USE_OF */