--- zzzz-none-000/linux-2.6.13.1/drivers/char/Kconfig	2005-09-10 02:42:58.000000000 +0000
+++ ohio-7170-487/linux-2.6.13.1/drivers/char/Kconfig	2008-02-27 12:34:44.000000000 +0000
@@ -1002,5 +1002,276 @@
 
 source "drivers/char/tpm/Kconfig"
 
+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 y
+	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_SEMTECHFIX
+	bool "Semtech Fix for W701"
+    depends on AVM_POWER
+	default n
+	help
+	  This fix an hardwarebug for dsl
+
+config AVM_DECT_IO
+	tristate "AVM dect IO managment support"
+	default y
+	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_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 2
+
+config AVM_PIGLET_NOEMIF_DONE
+    int "GPIO pin used for DONE"
+    depends on AVM_PIGLET_NOEMIF
+    default 16
+
+config AVM_PIGLET_NOEMIF_DATA
+    int "GPIO pin used for DATA"
+    depends on AVM_PIGLET_NOEMIF
+    default 5
+
+config AVM_PIGLET_NOEMIF_CLK
+    int "GPIO pin used for CLK"
+    depends on AVM_PIGLET_NOEMIF
+    default 4
+
+config AVM_PIGLET_NOEMIF_FPGAOK
+    int "GPIO pin used for FPGAOK"
+    depends on AVM_PIGLET_NOEMIF
+    default 3
+
+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 AVM_WATCHDOG
+	bool "Watchdog support"
+    depends on AVM_SAMMEL
+	default n
+	help
+	  This driver provides the watchdog support.
+
+config MIPS_AVALANCHE_LED
+	bool "LED support on the MIPS avalanche"
+    depends on AVM_SAMMEL
+	default n
+	help
+	  This driver provides LED support on the MIPS avalanche.
+
+config AVM_I2C
+	tristate "I2C Support for Ohio (AVM)"
+    depends on MIPS_OHIO
+	default y
+
+config AVM_LED
+	tristate "support for AVM Led new model"
+    depends on MIPS_OHIO || MIPS_AR7 || MIPS_UR8
+	default y
+
+config AVM_DEBUG
+	tristate "support for AVM Debug (instead UBIK2 Debug)"
+    depends on MIPS_UR8
+	default y
+
+config AVM_LED_OUTPUT_SHIFT_REGISTER
+    bool "LED driver using shift registers (74HC595)"
+    depends on AVM_LED
+	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
+	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 UBIK2
+	tristate "UBIK2/PCMLINK Driver Support for Ar7/Ohio/Ur8 (AVM)"
+    depends on MIPS_OHIO || MIPS_AR7 || MIPS_UR8
+	default n
+
+config PCMROUTE_ONLY
+	bool "only PCMROUTER for UBIK2 (minimize space)"
+    depends on UBIK2
+	default n
+
+config AVM_FLASH_UPDATE
+	tristate "FLASH_UPDATE Driver Support for Ohio (AVM)"
+	default n
+
+config TFFS2
+	tristate "TFFS 2.0"
+	default y
+    select ZLIB_INFLATE
+    select ZLIB_DEFLATE
+	help
+	  TFFS 2.0 support.
+
+config TFFS_ENV
+    bool "TFFS environment support"
+    depends on TFFS2
+    default 1
+    help
+      TFFS 2 environment support
+
+config TFFS_MTD_DEVICE_0
+    int "MTD device 0 for TFFS 2.0"
+    depends on TFFS2
+    default 3
+    help
+      Twin buffer for mtd 0
+
+config TFFS_MTD_DEVICE_1
+    int "MTD device 1 for TFFS 2.0"
+    depends on TFFS2
+    default 4
+    help
+      Twin buffer for mtd 1
+
+config TFFS_PANIC_LOG
+    bool "Enable TFFS Panic Log"
+    depends on TFFS2
+
+config TFFS_PANIC_LOG_ID
+    int "TFFS ID for TFFS panic log"
+    depends on TFFS_PANIC_LOG
+
+config AVM_RCAPI
+	tristate "AVM remote CAPI support"
+	default y
+	help
+	  This driver provides remote CAPI support (local side)
+	  
+	  To compile this driver as a module, choose M here. The module
+	  will be called avm.
+
 endmenu