From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755636Ab0ESBK4 (ORCPT ); Tue, 18 May 2010 21:10:56 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:49334 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753975Ab0ESBKy (ORCPT ); Tue, 18 May 2010 21:10:54 -0400 Date: Wed, 19 May 2010 11:10:50 +1000 From: Stephen Rothwell To: Kevin Hilman Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King , Cyril Chemparathy Subject: linux-next: manual merge of the davinci tree with the arm tree Message-Id: <20100519111050.337181c4.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Kevin, Today's linux-next merge of the davinci tree got a conflict in arch/arm/Kconfig between commit 717e7c2672e37253a4d3aa70e4716b5b0a658761 ("ARM: remove 'select GENERIC_TIME'") from the arm tree and commit b722049d7e60356fe04bcac6065a7c8b1c64c06f ("Davinci: allow SOCs based on other ARM CPUs") from the davinci tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/Kconfig index a07b6c4,1151d1a..0000000 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -760,9 -776,11 +760,8 @@@ config ARCH_NOMADI config ARCH_DAVINCI bool "TI DaVinci" - select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS - select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB - select HAVE_CLK select ZONE_DMA select HAVE_IDE select COMMON_CLKDEV