--- zzzz-none-000/linux-2.6.19.2/drivers/char/Kconfig	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/char/Kconfig	2008-07-14 12:52:31.000000000 +0000
@@ -409,6 +409,14 @@
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
+config MSPEC
+	tristate "Memory special operations driver"
+	depends on IA64
+	help
+	  If you have an ia64 and you want to enable memory special
+	  operations support (formerly known as fetchop), say Y here,
+	  otherwise say N.
+
 source "drivers/serial/Kconfig"
 
 config UNIX98_PTYS
@@ -681,6 +689,16 @@
 
 source "drivers/char/hw_random/Kconfig"
 
+config OMAP_RNG
+	tristate "OMAP Random Number Generator support"
+	depends on ARCH_OMAP16XX || ARCH_OMAP24XX
+	---help---
+	  This driver provides kernel-side support for the Random Number
+	  Generator hardware found on OMAP16xx and OMAP24xx multimedia
+	  processors.
+
+	  If unsure, say N.
+
 config NVRAM
 	tristate "/dev/nvram support"
 	depends on ATARI || X86 || ARM || GENERIC_NVRAM
@@ -783,6 +801,11 @@
 config EFI_RTC
 	bool "EFI Real Time Clock Services"
 	depends on IA64
+config OMAP_RTC
+	bool "TI OMAP Real Time Clock"
+	depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730
+	help
+	  Support for TI OMAP RTC
 
 config DS1302
 	tristate "DS1302 RTC support"
@@ -793,6 +816,12 @@
 	  will get access to the real time clock (or hardware clock) built
 	  into your computer.
 
+config DAVINCI_RTC
+	bool "TI DaVinci Real Time Clock"
+	depends on ARCH_DAVINCI && MACH_DAVINCI_EVM && I2C_DAVINCI
+	help
+	  Support for TI DaVinci RTC
+
 config COBALT_LCD
 	bool "Support for Cobalt LCD"
 	depends on MIPS_COBALT
@@ -1048,5 +1077,284 @@
 	  sysfs directory, /sys/devices/platform/telco_clock, with a number of
 	  files for controlling the behavior of this hardware.
 
+
+config TFFS
+    select ZLIB_INFLATE
+    select ZLIB_DEFLATE
+    bool "AVM (T)iny (F)lash (F)ile (S)ystem"
+    default y
+
+config TFFS_ENV
+    depends on TFFS
+    bool "AVM TFFS Enviorment support"
+    default y
+
+config TFFS_CRYPT
+    depends on TFFS
+    bool "AVM TFFS crypt support"
+    default y
+
+config TFFS_MTD_DEVICE_0
+    int "MTD partition used for first TFFS buffer"
+    default 3
+    depends on TFFS
+
+config TFFS_MTD_DEVICE_1
+    int "MTD partition used for second TFFS buffer"
+    default 4
+    depends on TFFS
+
+config TFFS_PANIC_LOG
+    bool "Enable TFFS Panic Log"
+    depends on TFFS
+
+config TFFS_PANIC_LOG_ID
+    int "TFFS ID for TFFS panic log"
+    depends on TFFS_PANIC_LOG
+
+config AVM_NET_TRACE
+	bool "AVM net trace"
+	default y
+	help
+	  This driver provides tracing of network packets in pcap format.
+
+config AVM_POWER
+	tristate "AVM power managment support"
+	default n
+	help
+	  This driver provides power managment functions for AVMs own drivers.
+	  
+	  To compile this driver as a module, choose M here. The module
+	  will be called avm.
+
+config AVM_POWERMETER
+	bool "AVM powermeter support"
+    depends on AVM_POWER
+	default y
+	help
+	  This driver provides power managment ressource info function for AVMs own drivers.
+
+config AVM_DECT_IO
+	tristate "AVM dect IO managment support"
+	default n
+	help
+	  This driver provides power managment functions for AVMs own drivers.
+	  
+	  To compile this driver as a module, choose M here. The module
+	  will be called avm.
+
+config AVM_SAMMEL
+	tristate "AVM general support (LED, Event, Watchdog)"
+	default y
+	help
+	  This driver provides general functions for AVMs own drivers.
+	  
+	  To compile this driver as a module, choose M here. The module
+	  will be called avm.
+
+config AVM_EVENT
+	bool "AVM event support"
+    depends on AVM_SAMMEL
+	default y
+	help
+	  This driver provides support for event handling.
+
+config AVM_PUSH_BUTTON
+	bool "Push button support"
+    depends on AVM_EVENT
+	default n
+	help
+	  This driver provides push button support.
+
+config AVM_PUSH_BUTTON_TIME_1
+    int "Time to start push button event 2 [ms]"
+    depends on AVM_EVENT && AVM_PUSH_BUTTON
+	default 2000
+
+config AVM_PUSH_BUTTON_TIME_2
+    int "Time to start push button event 3 [ms]"
+    depends on AVM_EVENT && AVM_PUSH_BUTTON
+	default 6000
+
+config AVM_PUSH_BUTTON_GPIO 
+	int "Push button GPIO"
+    depends on AVM_EVENT && AVM_PUSH_BUTTON
+	default 8
+	help
+	  This is the GPIO for avm event push button support
+
+config AVM_PUSH_BUTTON2
+	bool "second Push button support"
+    depends on AVM_EVENT
+	default n
+	help
+	  This driver provides push button support.
+
+config AVM_PUSH_BUTTON2_GPIO 
+	int "second Push button GPIO"
+    depends on AVM_EVENT && AVM_PUSH_BUTTON && AVM_PUSH_BUTTON2
+	default 6
+	help
+	  This is the GPIO for avm event push button support
+
+config AVM_PUSH_BUTTON3
+	bool "Switch support"
+    depends on AVM_EVENT
+	default n
+	help
+	  This driver provides switch support.
+
+config AVM_PUSH_BUTTON3_GPIO 
+	int "Switch GPIO"
+    depends on AVM_EVENT && AVM_PUSH_BUTTON && AVM_PUSH_BUTTON3
+	default 6
+	help
+	  This is the GPIO for avm event switch support
+
+config AVM_PUSH_BUTTON4
+	bool "4th Push button support"
+    depends on AVM_EVENT
+	default n
+	help
+	  This driver provides 4th Push button support.
+
+config AVM_PUSH_BUTTON4_GPIO 
+	int "4th Push button GPIO"
+    depends on AVM_EVENT && AVM_PUSH_BUTTON && AVM_PUSH_BUTTON4
+	default 31
+	help
+	  This is the GPIO for avm event 4th Push button support
+
+config AVM_AUDIO
+	tristate "AVM audio support"
+	default n
+	help
+	  This driver provides the AVM audio support.
+
+config PIGLET_AUDIO
+	tristate "Piglet audio support"
+	depends on AVM_AUDIO
+	default n
+	help
+	  This driver provides the piglet audio support.
+	  
+config NLR_AUDIO
+	tristate "NLR audio support"
+	depends on AVM_AUDIO
+	default n
+	help
+	  This driver provides the NLR audio support.
+
+config AVM_WATCHDOG
+	bool "Watchdog support"
+    depends on AVM_SAMMEL
+	default n
+	help
+	  This driver provides the watchdog support.
+
+config AVM_LED_EVENTS
+	tristate "support for AVM Led event based version"
+	default n
+
+config AVM_LED
+	tristate "support for AVM Led "
+	default y
+
+config AVM_DEBUG
+	tristate "support for AVM Debug (instead UBIK2 Debug)"
+    depends on MIPS_UR8
+	default y
+
+config LED_REMAP_STATES
+    bool "enable remap of LED states"
+    depends on AVM_LED
+    default y
+
+
+config AVM_LED_OUTPUT_SHIFT_REGISTER
+    bool "LED driver using shift registers (74HC595)"
+    depends on AVM_LED || AVM_LED_EVENTS
+	default n
+
+config AVM_LED_BIER_HOLEN
+    bool "LED driver Bier holen"
+    depends on AVM_LED
+	default n
+
+config AVM_LED_OUTPUT_SHIFT_REGISTER_MASTER_RESET
+    int "GPIO pin used for Master Reset"
+    depends on AVM_LED_OUTPUT_SHIFT_REGISTER
+    default 12
+
+config AVM_LED_OUTPUT_SHIFT_REGISTER_SHIFT_CLOCK
+    int "GPIO pin used for shift register clock"
+    depends on AVM_LED_OUTPUT_SHIFT_REGISTER
+    default 13
+
+config AVM_LED_OUTPUT_SHIFT_REGISTER_STORAGE_CLOCK
+    int "GPIO pin used for storage register clock"
+    depends on AVM_LED_OUTPUT_SHIFT_REGISTER
+    default 10
+
+config AVM_LED_OUTPUT_SHIFT_REGISTER_DATA
+    int "GPIO pin used for data input"
+    depends on AVM_LED_OUTPUT_SHIFT_REGISTER
+    default 9
+
+config AVM_LED_OUTPUT_GPIO
+    bool "LED driver using direct GPIOs"
+    depends on AVM_LED || AVM_LED_EVENTS
+	default y
+
+config AVM_LED_OUTPUT_DUAL_GPIO
+    bool "LED driver using direct two GPIOs for dual-color-leds"
+    depends on AVM_LED_OUTPUT_GPIO
+	default n
+
+config AVM_FLASH_UPDATE
+	tristate "FLASH_UPDATE Driver Support (AVM)"
+	default n
+
+config AVM_PIGLET
+	tristate "AVM Piglet load support"
+	default n
+	help
+	  This driver provides the piglet load support.
+
+config AVM_PIGLET_NOEMIF
+	tristate "AVM Piglet load support (No Emif)"
+	default n
+	help
+	  This driver provides the piglet load support (without Emif).
+
+config AVM_PIGLET_NOEMIF_PROG
+    int "GPIO pin used for PROG"
+    depends on AVM_PIGLET_NOEMIF
+    default 39
+
+config AVM_PIGLET_NOEMIF_DONE
+    int "GPIO pin used for DONE"
+    depends on AVM_PIGLET_NOEMIF
+    default 41
+
+config AVM_PIGLET_NOEMIF_DATA
+    int "GPIO pin used for DATA"
+    depends on AVM_PIGLET_NOEMIF
+    default 13
+
+config AVM_PIGLET_NOEMIF_CLK
+    int "GPIO pin used for CLK"
+    depends on AVM_PIGLET_NOEMIF
+    default 12
+
+config AVM_PIGLET_NOEMIF_FPGAOK
+    int "GPIO pin used for FPGAOK"
+    depends on AVM_PIGLET_NOEMIF
+    default 29
+
+config UBIK2
+	tristate "UBIK2/PCMLINK Driver Support for Ar7/Ohio/Ur8 (AVM)"
+    depends on MIPS_OHIO || MIPS_AR7 || MIPS_UR8
+	default n
 endmenu