--- zzzz-none-000/linux-2.6.28.10/drivers/char/Kconfig	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/drivers/char/Kconfig	2012-06-08 16:32:35.000000000 +0000
@@ -1065,6 +1065,232 @@
 	  /sys/devices/platform/telco_clock, with a number of files for
 	  controlling the behavior of this hardware.
 
+if LANTIQ
+#IFX plaform specific
+source "drivers/char/Kconfig.ifx"
+endif
+
+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 AVM_NET_TRACE
+	bool "AVM net trace"
+	default y
+	help
+	  This driver provides tracing of network packets in pcap format.
+
+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_DECT_SYNC
+	int "AVM dect sync support"
+    depends on AVM_DECT_IO
+	default -1
+	help
+	  the number of gpio for sync-usage, -1: ignore sync 
+
+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_LED_EVENTS
+	tristate "support for AVM Led event based version"
+	default n
+
+config AVM_WATCHDOG
+	bool "Watchdog support"
+    depends on AVM_SAMMEL
+	default n
+	help
+	  This driver provides the watchdog support.
+
+config AVM_DEBUG
+	bool "support for AVM Debug"
+    depends on AVM_SAMMEL
+	default y
+
+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_PUSH_BUTTON5
+	bool "5th Push button support"
+    depends on AVM_EVENT
+	default n
+	help
+	  This driver provides 5th Push button support.
+
+config AVM_PUSH_BUTTON5_GPIO 
+	int "5th Push button GPIO"
+    depends on AVM_EVENT && AVM_PUSH_BUTTON && AVM_PUSH_BUTTON5
+	default 31
+	help
+	  This is the GPIO for avm event 5th Push button support
+
+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_DECT
+	bool "AVM Piglet DECT Loader support"
+    depends on AVM_PIGLET_NOEMIF
+	default y
+	help
+	  This driver provides the DECT loader support in piglet
+
+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 UBIK2
+	tristate "UBIK2/PCMLINK Driver Support (AVM)"
+	default n
+
+config UBIK2_DEVELOPMENT_SUPPORT
+	int "Mask for Developmentfeature"
+    depends on UBIK2
+	default 0
+	help
+	  0x1 Touch-Datenerfassung/TDM-Rawdaten-Erfassung
+	  0x2 UK0-Interfacehack
+config UBIK2_MSEC_PER_IRQ
+	int "interrupt-trigger"
+    depends on UBIK2
+	default 8
+	help
+        only 4 or 8 ms supported
+
+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 DEVPORT
 	bool
 	depends on !M68K