From 87dca7b1e0e5eb219a6e26d90a1582c17aaa3812 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Tue, 26 Jan 2021 13:51:06 +0200 Subject: ARM: omap2plus_defconfig: Update for moved options Update for the following moved options to make applying defconfig related patches easier. Signed-off-by: Tony Lindgren --- arch/arm/configs/omap2plus_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'arch/arm/configs/omap2plus_defconfig') diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 1c11d1557779..8f649a939dde 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -158,9 +158,9 @@ CONFIG_MTD_ONENAND=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_OMAP2=y CONFIG_MTD_RAW_NAND=y -CONFIG_MTD_NAND_ECC_SW_BCH=y CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP_BCH=y +CONFIG_MTD_NAND_ECC_SW_BCH=y CONFIG_MTD_SPI_NOR=m CONFIG_MTD_UBI=y CONFIG_ZRAM=m @@ -202,11 +202,11 @@ CONFIG_TI_CPSW_SWITCHDEV=y CONFIG_TI_CPTS=y # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set -CONFIG_DP83848_PHY=y -CONFIG_DP83867_PHY=y CONFIG_MICREL_PHY=y CONFIG_AT803X_PHY=y CONFIG_SMSC_PHY=y +CONFIG_DP83848_PHY=y +CONFIG_DP83867_PHY=y CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_DEFLATE=m @@ -517,14 +517,14 @@ CONFIG_IIO=m CONFIG_IIO_SW_DEVICE=m CONFIG_IIO_SW_TRIGGER=m CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_KXCJK1013=m CONFIG_CPCAP_ADC=m CONFIG_INA2XX_ADC=m CONFIG_TI_AM335X_ADC=m CONFIG_TWL4030_MADC=m CONFIG_SENSORS_ISL29028=m -CONFIG_BMP280=m -CONFIG_KXCJK1013=m CONFIG_AK8975=m +CONFIG_BMP280=m CONFIG_PWM=y CONFIG_PWM_OMAP_DMTIMER=m CONFIG_PWM_TIECAP=m -- cgit