git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
shmobile_defconfig
diff --git
a/arch/arm/configs/shmobile_defconfig
b/arch/arm/configs/shmobile_defconfig
index b553e2c45e864f288c47f6fc5681e2dc5eded445..b17036088726eb2b135473fbd41a82d587c48f3f 100644
(file)
--- a/
arch/arm/configs/shmobile_defconfig
+++ b/
arch/arm/configs/shmobile_defconfig
@@
-18,7
+18,6
@@
CONFIG_ARCH_R8A7790=y
CONFIG_ARCH_R8A7791=y
CONFIG_ARCH_R8A7794=y
CONFIG_ARCH_SH73A0=y
-CONFIG_MACH_LAGER=y
CONFIG_MACH_MARZEN=y
CONFIG_CPU_BPREDICT_DISABLE=y
CONFIG_PL310_ERRATA_588369=y