--- zzzz-none-000/linux-2.6.32.61/drivers/char/Kconfig	2013-06-10 09:43:48.000000000 +0000
+++ ar10-7272-687/linux-2.6.32.61/drivers/char/Kconfig	2015-05-18 15:35:06.000000000 +0000
@@ -1029,6 +1029,14 @@
 
 	  If compiled as a module, it will be called cs5535_gpio.
 
+config GPIO_DEVICE
+	tristate "GPIO device support"
+	depends on GENERIC_GPIO
+	help
+	  Say Y to enable Linux GPIO device support.  This allows control of
+	  GPIO pins using a character device
+
+
 config RAW_DRIVER
 	tristate "RAW driver (/dev/raw/rawN)"
 	depends on BLOCK
@@ -1116,7 +1124,298 @@
 	depends on ISA || PCI
 	default y
 
+config TFFS
+#    depends on !TFFS3
+    select ZLIB_INFLATE
+    select ZLIB_DEFLATE
+    bool "AVM (T)iny (F)lash (F)ile (S)ystem"
+    default y
+
+config TFFS_MTD_DEVICE_0
+    int "MTD partition used for first TFFS buffer"
+    default 3
+    depends on TFFS || TFFS3
+
+config TFFS_MTD_DEVICE_1
+    int "MTD partition used for second TFFS buffer"
+    default 4
+    depends on TFFS
+
+config TFFS3
+    depends on TFFS
+    select ZLIB_INFLATE
+    select ZLIB_DEFLATE
+    bool "AVM (T)iny (F)lash (F)ile (S)ystem (V3)"
+    default n
+
+config TFFS_DEV_MTDNOR
+    bool "Enable support for NOR MTD as TFFS backing device"
+    default n
+    depends on TFFS3
+
+config TFFS_DEV_MTDNAND
+    bool "Enable support for NAND MTD as TFFS backing device"
+    default n
+    depends on TFFS3
+
+config TFFS_DEV_BDEV
+    bool "Enable support for block device as TFFS backing device"
+    default n
+    depends on TFFS3
+
+config TFFS_DEV_CACHE
+    bool "Enable support for caching only (dummy) TFFS backing device"
+    default n
+    depends on TFFS3
+
+config TFFS_DEV_REMOTE
+    bool "Enable support for limited access to TFFS on remote event node"
+    default n
+    depends on TFFS3 && AVM_EVENT_20
+    
+config TFFS_DEV_LEGACY
+    bool "Enable support for legacy TFFS 2.0"
+    default n
+    depends on TFFS3
+
+config TFFS_ENV
+    depends on TFFS || TFFS3
+    bool "AVM TFFS Environment support"
+    default y
+
+config TFFS_CRYPT
+    depends on TFFS || TFFS3
+    bool "AVM TFFS crypt support"
+    default y
+
+config TFFS_PANIC_LOG
+    bool "Enable TFFS Panic Log"
+    depends on TFFS || TFFS3
+
+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
+	bool "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_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_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_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_DEBUG
+	tristate "support for AVM Debug (instead UBIK2 Debug)"
+	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_DECT
+	bool "AVM Piglet DECT Loader support (only on Piglet No Emif)"
+    depends on AVM_PIGLET_NOEMIF
+	default y
+	help
+	  This driver provides the DECT loader support in piglet
+
+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 integrierter Ec-Generator
+
+config UBIK2_MSEC_PER_IRQ
+	int "interrupt-trigger"
+    depends on UBIK2
+	default 8
+	help
+        only 4 or 8 ms supported
+
+config UBIK2_ISDNSTACK_ON_CPU
+	int "interrupt on cpuX"
+	depends on UBIK2 && SMP
+	default 1
+	help
+	  ISDN-Stack have to bind on fixed cpu
 source "drivers/s390/char/Kconfig"
 
+source "drivers/char/Kconfig.ifx"
+
 endmenu