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 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
imx_v4_v5_defconfig
diff --git
a/arch/arm/configs/imx_v4_v5_defconfig
b/arch/arm/configs/imx_v4_v5_defconfig
index f5f1111f2118729e5eed238ec554bb03a3602504..aeb1209e080463f2f2c69e5c8669d814cd6cf10f 100644
(file)
--- a/
arch/arm/configs/imx_v4_v5_defconfig
+++ b/
arch/arm/configs/imx_v4_v5_defconfig
@@
-20,9
+20,9
@@
CONFIG_MACH_MX27ADS=y
CONFIG_MACH_MX27_3DS=y
CONFIG_MACH_IMX27_VISSTRIM_M10=y
CONFIG_MACH_PCA100=y
-CONFIG_MACH_IMX27_DT=y
CONFIG_SOC_IMX1=y
CONFIG_SOC_IMX25=y
+CONFIG_SOC_IMX27=y
CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0