--- zzzz-none-000/linux-2.6.13.1/drivers/net/Kconfig 2005-09-10 02:42:58.000000000 +0000 +++ ohio-7170-487/linux-2.6.13.1/drivers/net/Kconfig 2007-05-16 09:53:43.000000000 +0000 @@ -172,8 +172,6 @@ or internal device. It is safe to say Y or M here even if your ethernet card lack MII. -source "drivers/net/arm/Kconfig" - config MACE tristate "MACE (Power Mac ethernet) support" depends on NET_ETHERNET && PPC_PMAC && PPC32 @@ -790,6 +788,17 @@ . The module will be called smc-ultra32. +config TI_DAVINCI_EMAC + tristate "TI DAVINCI EMAC Support" + depends on NETDEVICES + 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 @@ -888,6 +897,7 @@ source "drivers/net/tulip/Kconfig" + config AT1700 tristate "AT1700/1720 support (EXPERIMENTAL)" depends on NET_ETHERNET && (ISA || MCA_LEGACY) && EXPERIMENTAL @@ -1371,9 +1381,9 @@ select MII ---help--- This driver supports Intel(R) PRO/100 family of adapters. - To verify that your adapter is supported, find the board ID number - on the adapter. Look for a label that has a barcode and a number - in the format 123456-001 (six digits hyphen three digits). + To verify that your adapter is supported, find the board ID number + on the adapter. Look for a label that has a barcode and a number + in the format 123456-001 (six digits hyphen three digits). Use the above information and the Adapter & Driver ID Guide at: @@ -1385,13 +1395,49 @@ - More specific information on configuring the driver is in + More specific information on configuring the driver is in . To compile this driver as a module, choose M here and read . The module will be called e100. +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 LNE390 tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)" depends on NET_PCI && EISA && EXPERIMENTAL @@ -1805,7 +1851,7 @@ depends on PCI ---help--- This driver supports Intel(R) PRO/1000 gigabit ethernet family of - adapters. For more information on how to identify your adapter, go + adapters. For more information on how to identify your adapter, go to the Adapter & Driver ID Guide at: @@ -1815,7 +1861,7 @@ - More specific information on configuring the driver is in + More specific information on configuring the driver is in . To compile this driver as a module, choose M here and read @@ -1918,7 +1964,7 @@ ---help--- Say Y here for the r8169 driver to support the functions required by the kernel 802.1Q code. - + If in doubt, say Y. config SKGE @@ -1930,9 +1976,9 @@ and related Gigabit Ethernet adapters. It is a new smaller driver driver with better performance and more complete ethtool support. - It does not support the link failover and network management + It does not support the link failover and network management features that "portable" vendor supplied sk98lin driver does. - + config SK98LIN tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support" depends on PCI @@ -1997,16 +2043,16 @@ - SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter - SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link) - SMC EZ Card 1000 (SMC9452TXV.2) - + The adapters support Jumbo Frames. The dual link adapters support link-failover and dual port features. - Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support - the scatter-gather functionality with sendfile(). Please refer to + Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support + the scatter-gather functionality with sendfile(). Please refer to for more information about optional driver parameters. Questions concerning this driver may be addressed to: - + If you want to compile this driver as a module ( = code which can be inserted in and removed from the running kernel whenever you want), say M here and read . The module will @@ -2046,7 +2092,7 @@ tristate "Gianfar Ethernet" depends on 85xx || 83xx help - This driver supports the Gigabit TSEC on the MPC85xx + This driver supports the Gigabit TSEC on the MPC85xx family of chips, and the FEC on the 8540 config GFAR_NAPI @@ -2106,7 +2152,7 @@ - More specific information on configuring the driver is in + More specific information on configuring the driver is in . To compile this driver as a module, choose M here and read @@ -2134,8 +2180,8 @@ tristate "S2IO 10Gbe XFrame NIC" depends on PCI ---help--- - This driver supports the 10Gbe XFrame NIC of S2IO. - For help regarding driver compilation, installation and + This driver supports the 10Gbe XFrame NIC of S2IO. + For help regarding driver compilation, installation and tuning please look into ~/drivers/net/s2io/README.txt. config S2IO_NAPI @@ -2161,8 +2207,8 @@ ---help--- On enabling the 2 buffer mode, the received frame will be split into 2 parts before being DMA'ed to the hosts memory. - The parts are the ethernet header and ethernet payload. - This is useful on systems where DMA'ing to to unaligned + The parts are the ethernet header and ethernet payload. + This is useful on systems where DMA'ing to to unaligned physical memory loactions comes with a heavy price. If not sure please say N. @@ -2180,6 +2226,8 @@ source "drivers/atm/Kconfig" +source "drivers/vinax/Kconfig" + source "drivers/s390/net/Kconfig" config ISERIES_VETH @@ -2424,9 +2472,9 @@ Support for PPP over Ethernet. This driver requires the latest version of pppd from the CVS - repository at cvs.samba.org. Alternatively, see the + repository at cvs.samba.org. Alternatively, see the RoaringPenguin package () - which contains instruction on how to use this driver (under + which contains instruction on how to use this driver (under the heading "Kernel mode PPPoE"). config PPPOATM @@ -2563,4 +2611,7 @@ config NET_POLL_CONTROLLER def_bool NETPOLL +config REMOTE_FRITZ_CONTROL + tristate "Remote Fritz!Control" + endmenu