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 tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
configs
/
shmobile_defconfig
diff --git
a/arch/arm/configs/shmobile_defconfig
b/arch/arm/configs/shmobile_defconfig
index cc67508a439a4486cb97365b04778b6fa0e2158e..63fb5316ff02a1a8fea511e662f931b4fea3be5a 100644
(file)
--- a/
arch/arm/configs/shmobile_defconfig
+++ b/
arch/arm/configs/shmobile_defconfig
@@
-17,7
+17,6
@@
CONFIG_ARCH_R8A7779=y
CONFIG_ARCH_R8A7790=y
CONFIG_ARCH_R8A7791=y
CONFIG_ARCH_R8A7794=y
-CONFIG_MACH_KOELSCH=y
CONFIG_MACH_LAGER=y
CONFIG_MACH_MARZEN=y
# CONFIG_SWP_EMULATE is not set