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 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
configs
/
multi_v4t_defconfig
diff --git
a/arch/arm/configs/multi_v4t_defconfig
b/arch/arm/configs/multi_v4t_defconfig
index
433eebb
..
9a6390c
100644
(file)
--- a/
arch/arm/configs/multi_v4t_defconfig
+++ b/
arch/arm/configs/multi_v4t_defconfig
@@
-20,9
+20,7
@@
CONFIG_INTEGRATOR_CM720T=y
CONFIG_INTEGRATOR_CM920T=y
CONFIG_INTEGRATOR_CM922T_XA10=y
CONFIG_ARCH_MXC=y
-CONFIG_MACH_SCB9328=y
-CONFIG_MACH_APF9328=y
-CONFIG_MACH_IMX1_DT=y
+CONFIG_SOC_IMX1=y
CONFIG_ARCH_NSPIRE=y
CONFIG_AEABI=y
# CONFIG_ATAGS is not set