Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756850Ab0GMC3Z (ORCPT ); Mon, 12 Jul 2010 22:29:25 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:27425 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756204Ab0GMC3W (ORCPT ); Mon, 12 Jul 2010 22:29:22 -0400 Date: Tue, 13 Jul 2010 11:29:22 +0900 From: Kukjin Kim Subject: RE: linux-next: manual merge of the s5p tree with Linus' tree In-reply-to: <20100713111451.8b6162e4.sfr@canb.auug.org.au> To: "'Stephen Rothwell'" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "=?ISO-8859-1?Q?'Uwe_Kleine-K=F6nig'?=" Message-id: <00d301cb2233$375169f0$a5f43dd0$%kim@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Content-type: text/plain; charset=ISO-8859-1 Content-language: ko Content-transfer-encoding: 7BIT Thread-index: AcsiKM36GMbau05TQNWdLAYF0l/UEQACAxgQ References: <20100713111451.8b6162e4.sfr@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1851 Lines: 64 Stephen Rothwell wrote: > > Hi Kukjin, > Hi :-) > Today's linux-next merge of the s5p tree got a conflict in > arch/arm/configs/s5pv210_defconfig between commit > 07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from > Linus' tree and commit 2976beb1dd86974ae98a992ca23a626f8be7e7dd ("ARM: > s5pv210_defconfig: Update for removing s5pc110_defconfig") from the s5p > tree. > > I fixed it up (see below - it may no longer be minimal) and can carry the > fix as necessary. Thanks..and I will fix it in my tree. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --git a/arch/arm/configs/s5pv210_defconfig > b/arch/arm/configs/s5pv210_defconfig > index 1753836..bbb1736 100644 > --- a/arch/arm/configs/s5pv210_defconfig > +++ b/arch/arm/configs/s5pv210_defconfig > @@ -7,6 +7,10 @@ CONFIG_MODULE_UNLOAD=y > # CONFIG_BLK_DEV_BSG is not set > CONFIG_ARCH_S5PV210=y > CONFIG_S3C_LOWLEVEL_UART_PORT=1 > +CONFIG_S3C_DEV_FB=y > +CONFIG_S5PV210_SETUP_FB_24BPP=y > +CONFIG_MACH_AQUILA=y > +CONFIG_MACH_SMDKC110=y > CONFIG_MACH_SMDKV210=y > CONFIG_VMSPLIT_2G=y > CONFIG_PREEMPT=y > @@ -31,6 +35,9 @@ CONFIG_SERIAL_SAMSUNG=y > CONFIG_SERIAL_SAMSUNG_CONSOLE=y > CONFIG_HW_RANDOM=y > # CONFIG_HWMON is not set > +# CONFIG_RAMOOPS is not set > +CONFIG_MFD_SUPPORT=y > +# CONFIG_ABX500_CORE is not set > # CONFIG_VGA_CONSOLE is not set > # CONFIG_HID_SUPPORT is not set > # CONFIG_USB_SUPPORT is not set Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- 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/