projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'imx-soc-3.14' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
[cascardo/linux.git]
/
arch
/
arm
/
configs
/
armadillo800eva_defconfig
diff --git
a/arch/arm/configs/armadillo800eva_defconfig
b/arch/arm/configs/armadillo800eva_defconfig
index
fae939d
..
5abf1a2
100644
(file)
--- a/
arch/arm/configs/armadillo800eva_defconfig
+++ b/
arch/arm/configs/armadillo800eva_defconfig
@@
-15,7
+15,7
@@
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE
_LEGACY
=y
CONFIG_ARCH_R8A7740=y
CONFIG_MACH_ARMADILLO800EVA=y
# CONFIG_SH_TIMER_TMU is not set