linux-next: manual merge of the davinci tree with the arm tree
From: Stephen Rothwell
Date: Tue May 18 2010 - 21:11:00 EST
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@xxxxxxxxxxxxxxxx
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/