[PATCH 2/6] ARM: shmobile_defconfig: Cleanup from non-existing options

[Krzysztof Kozlowski]

Remove options which do not exist anymore:
 - DRM_RCAR_HDMI was merged to generic DRM bridge and is obsolete since
   commit 5c602531feb3 ("drm: rcar-du: Replace manual bridge
   implementation with DRM bridge");

 - SND_SOC_RSRC_CARD was replaced by SND_SIMPLE_SCU_CARD in commit
   d12c6216c4a5 ("ASoC: rsrc-card: rename rsrc-card to simple-scu-card
   phase3");

Signed-off-by: Krzysztof Kozlowski <krzk at kernel.org>
---
 arch/arm/configs/shmobile_defconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 3c66a422fb4d..123a1debe3d7 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -155,7 +155,6 @@ CONFIG_VIDEO_ML86V7667=y
 CONFIG_DRM=y
 CONFIG_DRM_I2C_ADV7511=y
 CONFIG_DRM_RCAR_DU=y
-CONFIG_DRM_RCAR_HDMI=y
 CONFIG_DRM_RCAR_LVDS=y
 CONFIG_FB_SH_MOBILE_LCDC=y
 CONFIG_FB_SH_MOBILE_MERAM=y
@@ -169,9 +168,9 @@ CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_SH4_FSI=y
 CONFIG_SND_SOC_RCAR=y
-CONFIG_SND_SOC_RSRC_CARD=y
 CONFIG_SND_SOC_AK4642=y
 CONFIG_SND_SOC_WM8978=y
+CONFIG_SND_SIMPLE_SCU_CARD=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_RCAR=y
-- 
2.7.4