--- zzzz-none-000/linux-2.6.28.10/drivers/net/Kconfig	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/drivers/net/Kconfig	2013-01-22 14:25:16.000000000 +0000
@@ -220,6 +220,26 @@
 
 source "drivers/net/arm/Kconfig"
 
+config AVM_CPMAC
+	tristate "AVM CPMAC support"
+	depends on NET_ETHERNET
+	help
+	  This driver is developed for the FRITZ!Box network hardware.
+	  To compile this driver as a module, choose M here.
+	  The module will be called avm_cpmac.
+
+config AVM_CPMAC_NUM_RX_BUFFERS
+    int "Number of Rx-Buffers"
+    depends on AVM_CPMAC
+    default 256
+
+config AVM_CPMAC_SWITCH
+    bool "Support for switches (currently ADM6996 family)"
+    depends on AVM_CPMAC
+    default y
+    help
+      Code for the ADMtek switch family ADM6996 (L, LC, FC)
+
 config AX88796
 	tristate "ASIX AX88796 NE2000 clone support"
 	depends on ARM || MIPS || SUPERH
@@ -1866,6 +1886,14 @@
 
 source "drivers/net/fs_enet/Kconfig"
 
+
+
+
+if LANTIQ
+#IFX plaform specific
+source "drivers/net/Kconfig.ifx"
+endif
+
 endif # NET_ETHERNET
 
 #
@@ -2340,6 +2368,108 @@
 	  To compile this driver as a module, choose M here. The module
 	  will be called jme.
 
+config AG7240
+    tristate "Atheros AR7240 GigE"
+    depends on MACH_AR7240
+    help
+        This enables the building of Atheros AR7240 gigE driver module.
+
+config  AG7240_GE0_IS_CONNECTED
+    bool "port 0 is connected to a PHY"
+    depends on AG7240
+
+choice
+    prompt "port 0 interface"
+    depends on AG7240
+
+config AG7240_GE0_MII
+    bool "MII mode"
+
+config AG7240_GE0_GMII
+    bool "GMII mode"
+
+config AG7240_GE0_RGMII
+    bool "RGMII mode"
+
+endchoice
+
+choice  
+    prompt "PHY or switch used"
+    depends on AG7240_GE0_IS_CONNECTED
+
+config AR7242_RGMII_PHY
+    bool "AR7242 RGMII Phy"
+
+config AR7242_S16_PHY
+    bool "AR7242 S16 Switch"
+
+endchoice
+
+config  AG7240_QOS
+    bool "Enable MAC 0 QOS "
+    depends on AG7240
+
+config  AG7240_GE1_IS_CONNECTED
+    bool "port 1 is connected to a PHY"
+    depends on AG7240
+
+choice
+    prompt "port 1 interface (depends on port0)"
+    depends on AG7240_GE1_IS_CONNECTED
+    
+config AG7240_GE1_MII
+    bool "MII mode"
+
+endchoice
+
+choice  
+    prompt "PHY or switch used"
+    depends on AG7240
+
+config AR7240_S26_PHY
+    bool "Atheros S26 Phy"
+
+config S26_SWITCH_ONLY_MODE
+    bool "Enable switch only mode"
+    depends on AR7240_S26_PHY
+
+endchoice
+
+config  AG7240_LEN_PER_TX_DS 
+        int "Len per tx descriptor" 
+        default "1536" 
+	depends on (REALTEK_PHY ||  ADM6996FC_PHY || ICPLUS_PHY) && AG7240
+
+config  AG7240_LEN_PER_TX_DS 
+        int "Len per tx descriptor" 
+	default "512" 	
+	depends on !(REALTEK_PHY ||  ADM6996FC_PHY || ICPLUS_PHY) && AG7240
+
+config  AG7240_NUMBER_TX_PKTS
+        int "Number tx pkts"   
+        default "100"
+        depends on AG7240
+
+config  AG7240_NUMBER_RX_PKTS
+        int "Number rx pkts"       
+        default "252"
+        depends on AG7240
+
+config  AG7240_MAC_LOCATION 
+    hex "Memory location of MAC addresses (in flash)" 
+	default "0xbfff0000" 	
+	help
+	  This is the physical address in memory that contains
+	  the MAC addresses for the board Ethernet interfaces.  They
+	  are stored sequentially in 6 byte groups, for the total number
+	  of interfaces supported on the board.
+	depends on AG7240
+
+config  AG7240_USE_TRC
+	bool "Print realtime trace on asserts, this will negatively affect performance"
+	default 0
+	depends on AG7240
+
 endif # NETDEV_1000
 
 #
@@ -3044,4 +3174,9 @@
 	  This is the virtual network driver for virtio.  It can be used with
           lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
 
+config AVM_NET_LINK_AUDIO
+        tristate "The AVM netlink-audio driver"
+        default n
+
+
 endif # NETDEVICES