Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161803AbbKTBrO (ORCPT ); Thu, 19 Nov 2015 20:47:14 -0500 Received: from dd34104.kasserver.com ([85.13.151.79]:57827 "EHLO dd34104.kasserver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161146AbbKTBrN (ORCPT ); Thu, 19 Nov 2015 20:47:13 -0500 From: Timo Sigurdsson To: tyler.baker@linaro.org, info@gerhard-bertelsmann.de, plaes@plaes.org, rafael.j.wysocki@intel.com, linux@arm.linux.org.uk, maxime.ripard@free-electrons.com, carlo@caione.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, wens@csie.org Cc: linux-sunxi@googlegroups.com, Timo Sigurdsson Subject: [PATCH v2 1/3] ARM: sunxi: Re-enable SID driver in sunxi_defconfig Date: Fri, 20 Nov 2015 02:46:17 +0100 Message-Id: <1447983979-12751-1-git-send-email-public_timo.s@silentcreek.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447724578-4786-1-git-send-email-public_timo.s@silentcreek.de> References: <1447724578-4786-1-git-send-email-public_timo.s@silentcreek.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1291 Lines: 40 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 --- 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 3c36e16..0bbc2ee 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 @@ -123,6 +122,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.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/