--- zzzz-none-000/linux-2.6.19.2/arch/arm/Kconfig	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/arm/Kconfig	2007-05-23 11:52:59.000000000 +0000
@@ -317,6 +317,10 @@
 	help
 	  Support for TI's OMAP platform (OMAP1 and OMAP2).
 
+config ARCH_DAVINCI
+	bool "TI DaVinci"
+
+
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
@@ -365,6 +369,8 @@
 
 source "arch/arm/mach-netx/Kconfig"
 
+source "arch/arm/mach-davinci/Kconfig"
+
 # Definitions to make life easier
 config ARCH_ACORN
 	bool
@@ -500,6 +506,10 @@
 	  Say Y here if you are building a kernel for a desktop, embedded
 	  or real-time system.  Say N if you are unsure.
 
+config SUPPORT_FIRQ
+	bool "Support Fast IRQ"
+	default n
+
 config NO_IDLE_HZ
 	bool "Dynamic tick timer"
 	help
@@ -574,6 +584,11 @@
 	default "2"
 	depends on NEED_MULTIPLE_NODES
 
+config CHECK_IDLE
+    depends on ARM
+    bool "Enable idle check"
+    default n
+
 source "mm/Kconfig"
 
 config LEDS
@@ -583,7 +598,7 @@
 		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
 		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
 		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-		   ARCH_AT91RM9200 || MACH_TRIZEPS4
+		   ARCH_AT91RM9200 || MACH_TRIZEPS4 || ARCH_DAVINCI
 	help
 	  If you say Y here, the LEDs on your machine will be used
 	  to provide useful information about your current system status.
@@ -597,7 +612,8 @@
 
 config LEDS_TIMER
 	bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
-			    MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
+			    MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 || \
+			    MACH_DAVINCI_EVM
 	depends on LEDS
 	default y if ARCH_EBSA110
 	help
@@ -612,8 +628,7 @@
 	  will overrule the CPU usage LED.
 
 config LEDS_CPU
-	bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
-			!ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
+	bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110)
 	depends on LEDS
 	help
 	  If you say Y here, the red LED will be used to give a good real
@@ -873,14 +888,12 @@
 if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
 	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
 	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
-	|| ARCH_IXP23XX
+	|| ARCH_IXP23XX || ARCH_DAVINCI
 source "drivers/ide/Kconfig"
 endif
 
 source "drivers/scsi/Kconfig"
 
-source "drivers/ata/Kconfig"
-
 source "drivers/md/Kconfig"
 
 source "drivers/message/fusion/Kconfig"
@@ -927,6 +940,12 @@
 
 source "drivers/rtc/Kconfig"
 
+source "drivers/ssi/Kconfig"
+
+if ARCH_OMAP
+source "drivers/cbus/Kconfig"
+endif
+
 endmenu
 
 source "fs/Kconfig"