Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965589Ab3FTOLE (ORCPT ); Thu, 20 Jun 2013 10:11:04 -0400 Received: from eu1sys200aog122.obsmtp.com ([207.126.144.153]:57216 "EHLO eu1sys200aog122.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935503Ab3FTOK7 (ORCPT ); Thu, 20 Jun 2013 10:10:59 -0400 From: Srinivas KANDAGATLA To: linux-arm-kernel@lists.infradead.org Cc: Rob Landley , Grant Likely , Rob Herring , Russell King , Srinivas Kandagatla , Stuart Menefy , John Stultz , Thomas Gleixner , Linus Walleij , Greg Kroah-Hartman , Jiri Slaby , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, kernel@stlinux.com, linux-serial@vger.kernel.org, Mark Brown , Stephen Gallimore Subject: [PATCH v3 08/10] ARM:stixxxx: Add stixxxx options to multi_v7_defconfig Date: Thu, 20 Jun 2013 15:06:40 +0100 Message-Id: <1371737200-9563-1-git-send-email-srinivas.kandagatla@st.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1371736996-8770-1-git-send-email-srinivas.kandagatla@st.com> References: <1371736996-8770-1-git-send-email-srinivas.kandagatla@st.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1325 Lines: 43 This patch adds stih415 and stih416 support to multi_v7_defconfig. CONFIG_ARM_ERRATA_754322 is removed as it is selected by the stixxxx mach level kconfig. Signed-off-by: Srinivas Kandagatla --- arch/arm/configs/multi_v7_defconfig | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index f2b4957..c0cfac0 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -9,11 +9,11 @@ CONFIG_PLAT_SPEAR=y CONFIG_ARCH_SPEAR13XX=y CONFIG_MACH_SPEAR1310=y CONFIG_MACH_SPEAR1340=y +CONFIG_ARCH_STIXXXX=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SIRF=y CONFIG_ARCH_WM8850=y CONFIG_ARCH_ZYNQ=y -CONFIG_ARM_ERRATA_754322=y CONFIG_SMP=y CONFIG_AEABI=y CONFIG_HIGHMEM=y @@ -43,6 +43,8 @@ CONFIG_SERIAL_SIRFSOC_CONSOLE=y CONFIG_SERIAL_VT8500=y CONFIG_SERIAL_VT8500_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_ST_ASC=y +CONFIG_SERIAL_ST_ASC_CONSOLE=y CONFIG_IPMI_HANDLER=y CONFIG_IPMI_SI=y CONFIG_I2C=y -- 1.7.6.5 -- 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/