From 5a5006fa3d0104a021b9a307da592f60c80bf6e8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 26 Apr 2014 12:26:39 +0100 Subject: [PATCH] minor omap config tweaks for recent option name changes, no functional change --- config-armv7 | 6 ++---- config-generic | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config-armv7 b/config-armv7 index fddaf6d8a..3944697d2 100644 --- a/config-armv7 +++ b/config-armv7 @@ -122,7 +122,8 @@ CONFIG_TWL4030_POWER=y CONFIG_TWL4030_WATCHDOG=m CONFIG_BATTERY_TWL4030_MADC=m CONFIG_OMAP_USB2=m -CONFIG_OMAP_USB3=m +CONFIG_OMAP_CONTROL_PHY=m +CONFIG_TI_PIPE3=m CONFIG_TWL4030_USB=m CONFIG_TWL6030_USB=m CONFIG_TWL6030_PWM=m @@ -286,9 +287,6 @@ CONFIG_RADIO_WL128X=m CONFIG_OMAP_REMOTEPROC=m -CONFIG_OMAP_CONTROL_PHY=m -CONFIG_TI_PIPE3=m - # CONFIG_TIDSPBRIDGE is not set # CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000 # CONFIG_TIDSPBRIDGE_DEBUG is not set diff --git a/config-generic b/config-generic index b3d1cfe89..f9deefe9e 100644 --- a/config-generic +++ b/config-generic @@ -3868,9 +3868,6 @@ CONFIG_USB_PHY=y # CONFIG_GENERIC_PHY is not set # CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set # CONFIG_PHY_EXYNOS_DP_VIDEO is not set -# CONFIG_OMAP_USB2 is not set -# CONFIG_OMAP_USB3 is not set -# CONFIG_OMAP_CONTROL_USB is not set # CONFIG_AM335X_PHY_USB is not set # CONFIG_SAMSUNG_USBPHY is not set # CONFIG_SAMSUNG_USB2PHY is not set