--- zzzz-none-000/linux-2.6.19.2/drivers/net/Kconfig	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/net/Kconfig	2007-12-18 17:34:01.000000000 +0000
@@ -190,6 +190,42 @@
 
 source "drivers/net/arm/Kconfig"
 
+config MIPS_AVALANCHE_USB
+        tristate "AVM USB NET support"
+        depends on NET_ETHERNET
+        help
+          This driver is developed for the FRITZ!Box USB NET hardware.
+          To compile this driver as a module, choose M here.
+          The module will be called avm_usb.
+
+config MIPS_AVALANCHE_USB_CDROM
+    bool "CDROM Mode support for AVM USB NET"
+    depends on MIPS_AVALANCHE_USB
+
+config MIPS_AVALANCHE_USB_DEBUG
+    int "Debug print support for AVM USB NET"
+    depends on MIPS_AVALANCHE_USB
+
+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 MACE
 	tristate "MACE (Power Mac ethernet) support"
 	depends on NET_ETHERNET && PPC_PMAC && PPC32
@@ -486,7 +522,7 @@
 
 config MIPS_SIM_NET
 	tristate "MIPS simulator Network device (EXPERIMENTAL)"
-	depends on MIPS_SIM && EXPERIMENTAL
+	depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL
 	help
 	  The MIPSNET device is a simple Ethernet network device which is
 	  emulated by the MIPS Simulator.
@@ -817,6 +853,15 @@
 	  <file:Documentation/networking/net-modules.txt>. The module
 	  will be called smc-ultra32.
 
+config TI_DAVINCI_EMAC
+	tristate "TI DaVinci EMAC Support"
+	depends on NETDEVICES && MACH_DAVINCI_EVM
+	help
+	  This driver supports TI's DaVinci Ethernet .
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called ti_davinci_emac.  This is recommended.
+
 config SMC91X
 	tristate "SMC 91C9x/91C1xxx support"
 	select CRC32
@@ -2112,7 +2157,7 @@
 
 config SKY2
 	tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
-	depends on PCI
+	depends on PCI && EXPERIMENTAL
 	select CRC32
 	---help---
 	  This driver supports Gigabit Ethernet adapters based on the
@@ -2120,8 +2165,8 @@
 	  Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
 	  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
 
-	  There is companion driver for the older Marvell Yukon and
-	  Genesis based adapters: skge.
+	  This driver does not support the original Yukon chipset: a seperate
+	  driver, skge, is provided for Yukon-based adapters.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called sky2.  This is recommended.
@@ -2459,6 +2504,8 @@
 
 source "drivers/atm/Kconfig"
 
+source "drivers/vinax/Kconfig"
+
 source "drivers/s390/net/Kconfig"
 
 config ISERIES_VETH
@@ -2467,7 +2514,7 @@
 
 config RIONET
 	tristate "RapidIO Ethernet over messaging driver support"
-	depends on RAPIDIO
+	depends on NETDEVICES && RAPIDIO
 
 config RIONET_TX_SIZE
 	int "Number of outbound queue entries"
@@ -2717,7 +2764,6 @@
        select CRYPTO
        select CRYPTO_SHA1
        select CRYPTO_ARC4
-       select CRYPTO_ECB
        ---help---
          Support for the MPPE Encryption protocol, as employed by the
 	 Microsoft Point-to-Point Tunneling Protocol.
@@ -2833,7 +2879,7 @@
 	  "SCSI generic support".
 
 config SHAPER
-	tristate "Traffic Shaper (OBSOLETE)"
+	tristate "Traffic Shaper (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
 	---help---
 	  The traffic shaper is a virtual network device that allows you to
@@ -2842,9 +2888,9 @@
 	  these virtual devices. See
 	  <file:Documentation/networking/shaper.txt> for more information.
 
-	  An alternative to this traffic shaper are traffic schedulers which
-	  you'll get if you say Y to "QoS and/or fair queuing" in
-	  "Networking options".
+	  An alternative to this traffic shaper is the experimental
+	  Class-Based Queuing (CBQ) scheduling support which you get if you
+	  say Y to "QoS and/or fair queuing" above.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called shaper.  If unsure, say N.
@@ -2874,4 +2920,7 @@
 config NET_POLL_CONTROLLER
 	def_bool NETPOLL
 
+config REMOTE_FRITZ_CONTROL
+        tristate "Remote Fritz!Control"
+
 endmenu