From 812c159eab1964e7adcdcbe52ba6c34dbe06adca Mon Sep 17 00:00:00 2001 From: Timo Sigurdsson Date: Fri, 20 Nov 2015 02:46:17 +0100 Subject: [PATCH] ARM: sunxi: Re-enable SID driver in sunxi_defconfig Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem framework") moved the the sunxi SID driver to a new framework, but left sunxi_defconfig with the deprecated config symbol EEPROM_SUNXI_SID instead of the new symbol NVMEM_SUNXI_SID. Hence, re-enable the driver in sunxi_defconfig. Signed-off-by: Timo Sigurdsson Acked-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- arch/arm/configs/sunxi_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 18dbfaddb727..603dc8c97c42 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -37,7 +37,6 @@ CONFIG_CAN_SUN4I=y # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_EEPROM_SUNXI_SID=y CONFIG_BLK_DEV_SD=y CONFIG_ATA=y CONFIG_AHCI_SUNXI=y @@ -125,6 +124,8 @@ CONFIG_PWM=y CONFIG_PWM_SUN4I=y CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_SUN9I_USB=y +CONFIG_NVMEM=y +CONFIG_NVMEM_SUNXI_SID=y CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y -- 2.39.5