Commit 4b327b92 authored Nov 19, 2015 by Timo Sigurdsson Committed by Maxime Ripard Nov 20, 2015

ARM: sunxi: Re-enable SID driver in multi_v7_defconfig



Commit 3d0b16a6 ("nvmem: sunxi: Move the SID driver to the nvmem
framework") moved the the sunxi SID driver to a new framework, but left
multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID
instead of the new symbol NVMEM_SUNXI_SID. Hence, re-enable the driver
in multi_v7_defconfig.

Signed-off-by: Timo Sigurdsson <public_timo.s@silentcreek.de>
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

parent 83e9e1f8

arch/arm/configs/multi_v7_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -189,7 +189,6 @@ CONFIG_ATMEL_SSC=m
		CONFIG_APDS9802ALS=y
		CONFIG_ISL29003=y
		CONFIG_EEPROM_AT24=y
		CONFIG_EEPROM_SUNXI_SID=y
		CONFIG_BLK_DEV_SD=y
		CONFIG_BLK_DEV_SR=y
		CONFIG_SCSI_MULTI_LUN=y
		@@ -709,6 +708,8 @@ CONFIG_PHY_STIH407_USB=y
		CONFIG_PHY_SUN4I_USB=y
		CONFIG_PHY_SUN9I_USB=y
		CONFIG_PHY_SAMSUNG_USB2=m
		CONFIG_NVMEM=y
		CONFIG_NVMEM_SUNXI_SID=y
		CONFIG_EXT4_FS=y
		CONFIG_AUTOFS4_FS=y
		CONFIG_MSDOS_FS=y