mirror of
https://github.com/torvalds/linux.git
synced 2026-08-01 03:59:40 +02:00
ARM: multi_v7_defconfig: Cleanup redundant options
Drop all redundant entries: 1. SERIAL_BCM63XX is default=y for ARCH_BCMBCA. 2. USB_GPIO_VBUS is conflicting with enabled USB_CONN_GPIO since commit0ce0f9d078("usb: phy: phy-gpio-vbus-usb: Add device tree probing"). 3. SND_HDA_CODEC_REALTEK_LIB is selected by other codecs, SND_HDA_CODEC_ALC269 by default. 4. SND_PXA_SOC_SSP depends on ARCH_PXA which is only for multi v5. 5. SND_SOC_ROCKCHIP is gone since commitcae3cc435d("ASoC: rockchip: Standardize ASoC menu") and can be simply dropped without effect. 6. SND_SOC_TLV320AIC32X4 is selected by SND_SOC_TLV320AIC32X4_I2C/SPI. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Reviewed-by: Linus Walleij <linusw@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
c62cee042d
commit
9d119de595
|
|
@ -387,7 +387,6 @@ CONFIG_SERIAL_MSM=y
|
|||
CONFIG_SERIAL_MSM_CONSOLE=y
|
||||
CONFIG_SERIAL_VT8500=y
|
||||
CONFIG_SERIAL_VT8500_CONSOLE=y
|
||||
CONFIG_SERIAL_BCM63XX=y
|
||||
CONFIG_SERIAL_BCM63XX_CONSOLE=y
|
||||
CONFIG_SERIAL_XILINX_PS_UART=y
|
||||
CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
|
||||
|
|
@ -802,8 +801,6 @@ CONFIG_SND_HDA_INPUT_BEEP=y
|
|||
CONFIG_SND_HDA_PATCH_LOADER=y
|
||||
CONFIG_SND_HDA_TEGRA=m
|
||||
CONFIG_SND_HDA_CODEC_REALTEK=m
|
||||
CONFIG_SND_HDA_CODEC_REALTEK_LIB=m
|
||||
CONFIG_SND_HDA_CODEC_ALC269=m
|
||||
CONFIG_SND_HDA_CODEC_HDMI=m
|
||||
CONFIG_SND_HDA_CODEC_HDMI_GENERIC=m
|
||||
CONFIG_SND_HDA_CODEC_HDMI_NVIDIA=m
|
||||
|
|
@ -816,12 +813,10 @@ CONFIG_SND_ATMEL_SOC_I2S=m
|
|||
CONFIG_SND_BCM2835_SOC_I2S=m
|
||||
CONFIG_SND_IMX_SOC=m
|
||||
CONFIG_SND_SOC_FSL_ASOC_CARD=m
|
||||
CONFIG_SND_PXA_SOC_SSP=m
|
||||
CONFIG_SND_MMP_SOC_SSPA=m
|
||||
CONFIG_SND_PXA910_SOC=m
|
||||
CONFIG_SND_SOC_QCOM=m
|
||||
CONFIG_SND_SOC_APQ8016_SBC=m
|
||||
CONFIG_SND_SOC_ROCKCHIP=m
|
||||
CONFIG_SND_SOC_SH4_FSI=m
|
||||
CONFIG_SND_SOC_RCAR=m
|
||||
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
|
||||
|
|
@ -863,7 +858,6 @@ CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
|
|||
CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
|
||||
CONFIG_SND_SOC_SGTL5000=m
|
||||
CONFIG_SND_SOC_STI_SAS=m
|
||||
CONFIG_SND_SOC_TLV320AIC32X4=m
|
||||
CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
|
||||
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
|
||||
CONFIG_SND_SOC_WM8960=m
|
||||
|
|
@ -923,7 +917,6 @@ CONFIG_KEYSTONE_USB_PHY=m
|
|||
CONFIG_NOP_USB_XCEIV=y
|
||||
CONFIG_AM335X_PHY_USB=m
|
||||
CONFIG_TWL6030_USB=m
|
||||
CONFIG_USB_GPIO_VBUS=y
|
||||
CONFIG_USB_ISP1301=y
|
||||
CONFIG_USB_MXS_PHY=y
|
||||
CONFIG_USB_GADGET=y
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user