Revert "arm: OMAP2+: defconfig: reconfigure according to savedefconfig"

This reverts commit 1465f7429fd1114b65824eb55ac9e838771f9f55.

Equivalent correct fix has to be submitted on top of ti-linux-3.8.y
to avoid dependency merge issues.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index ad8562a1488777ee7b919f2400a6c2ec248c30f9..629dcd2be20655c5af5841e8da6817e1415034cc 100644 (file)
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -84,11 +84,12 @@ CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_MD=y
 CONFIG_NETDEVICES=y
 CONFIG_KS8851=y
@@ -135,20 +136,21 @@ CONFIG_GPIO_TWL4030=y
 CONFIG_W1=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_WATCHDOG=y
-CONFIG_PALMAS_WATCHDOG=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=y
+CONFIG_PALMAS_WATCHDOG=y
 CONFIG_MFD_TPS65217=y
-CONFIG_MFD_TPS65910=y
+CONFIG_REGULATOR_TWL4030=y
+CONFIG_MFD_PALMAS=y
 CONFIG_MFD_PALMAS_GPADC=y
 CONFIG_MFD_PALMAS_PWM=y
 CONFIG_MFD_PALMAS_RESOURCE=y
 CONFIG_REGULATOR_PALMAS=y
+CONFIG_MFD_TPS65910=y
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REGULATOR_TPS65910=y
-CONFIG_REGULATOR_TWL4030=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
@@ -188,32 +190,35 @@ CONFIG_USB=y
 CONFIG_USB_DEBUG=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_SUSPEND=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_DEBUG=y
 CONFIG_USB_DWC3_VERBOSE=y
-CONFIG_USB_MON=y
-CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_MON=y
 CONFIG_USB_WDM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_TEST=y
-CONFIG_OMAP_USB2=m
-CONFIG_OMAP_USB3=m
-CONFIG_OMAP_CONTROL_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_EEM=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_MULTI=m
 CONFIG_USB_G_MULTI_CDC=y
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_EEM=y
+CONFIG_OMAP_USB2=m
+CONFIG_OMAP_USB3=m
+CONFIG_OMAP_CONTROL_USB=y
+CONFIG_TWL4030_USB=m
+CONFIG_TWL6030_USB=m
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_PALMAS_USB=m
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y