diff options
| author | Nitin Garg <nitin.garg@freescale.com> | 2015-02-25 12:56:19 -0600 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-04-14 14:02:31 -0500 |
| commit | 8365db89a9077faf93e8c693da29a15af8142e28 (patch) | |
| tree | 9cbd8b9f450e1cab1a5a8ce0fff4b217da93448d /arch/arm/configs | |
| parent | 4c6b63ad576138eaf02ac2cc50819d40dc30d7e7 (diff) | |
MLK-10259: Remove ARCH_MULTI_V6 config from v7 defconfig
Sync imx_v7_defconfig with imx_3.10. ARCH_MULTI_V6 is
not required.
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 910b2c092c7a..27d7545abcbe 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -16,11 +16,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_MULTI_V6=y CONFIG_GPIO_PCA953X=y CONFIG_ARCH_MXC=y -# CONFIG_MACH_MX31ADS is not set -# CONFIG_MACH_BUG is not set CONFIG_MACH_IMX51_DT=y CONFIG_MACH_EUKREA_CPUIMX51SD=y CONFIG_SOC_IMX50=y @@ -189,8 +186,8 @@ CONFIG_SPI_IMX=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y CONFIG_SABRESD_MAX8903=y -CONFIG_SENSORS_MAX17135=y CONFIG_IMX6_USB_CHARGER=y +CONFIG_SENSORS_MAX17135=y CONFIG_SENSORS_MAG3110=y CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y |