diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:37:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:37:16 -0800 |
| commit | 167c6274c30d17c41742096d1a12c32bd3b7e366 (patch) | |
| tree | b28b98e34dd2b98db6fff8459cddbc65142cd891 /drivers/net/Kconfig | |
| parent | 5c7f0333584128c745fbda845abbe3a32c22d467 (diff) | |
| parent | a8272061fe533f6d0261b38c58c93bd0855baebe (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1757bb3f6e08..732ea834d50d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -61,6 +61,7 @@ config DUMMY config BONDING tristate "Bonding driver support" depends on INET + depends on IPV6 || IPV6=n ---help--- Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet Channels together. This is called 'Etherchannel' by Cisco, @@ -978,6 +979,20 @@ config SMC911X called smc911x. If you want to compile it as a module, say M here and read <file:Documentation/kbuild/modules.txt> +config SMSC911X + tristate "SMSC LAN911x/LAN921x families embedded ethernet support" + depends on ARM || SUPERH + select CRC32 + select MII + select PHYLIB + ---help--- + Say Y here if you want support for SMSC LAN911x and LAN921x families + of ethernet controllers. + + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called smsc911x. + config NET_VENDOR_RACAL bool "Racal-Interlan (Micom) NI cards" depends on ISA |