ChangeSet 1.2188.1.1, 2005/03/29 15:48:28-05:00, [EMAIL PROTECTED]
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/net-drivers-2.6
MAINTAINERS | 7 ++++---
drivers/net/Kconfig | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff -Nru a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS 2005-03-29 14:09:18 -08:00
+++ b/MAINTAINERS 2005-03-29 14:09:18 -08:00
@@ -2044,10 +2044,11 @@
S: Maintained
SIS 900/7016 FAST ETHERNET DRIVER
-P: Ollie Lho
-M: [EMAIL PROTECTED]
+P: Daniele Venzano
+M: [EMAIL PROTECTED]
+W: http://www.brownhat.org/sis900.html
L: [email protected]
-S: Supported
+S: Maintained
SIS FRAMEBUFFER DRIVER
P: Thomas Winischhofer
diff -Nru a/drivers/net/Kconfig b/drivers/net/Kconfig
--- a/drivers/net/Kconfig 2005-03-29 14:09:18 -08:00
+++ b/drivers/net/Kconfig 2005-03-29 14:09:18 -08:00
@@ -44,6 +44,7 @@
config BONDING
tristate "Bonding driver support"
depends on NETDEVICES
+ depends on INET
---help---
Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
Channels together. This is called 'Etherchannel' by Cisco,
@@ -612,7 +613,7 @@
will be called 3c507.
config EL3
- tristate "3c509/3c529 (MCA)/3c569B (98)/3c579 \"EtherLink III\" support"
+ tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
---help---
If you have a network (Ethernet) card belonging to the 3Com
@@ -876,7 +877,7 @@
source "drivers/net/tulip/Kconfig"
config AT1700
- tristate "AT1700/1720/RE1000Plus(C-Bus) support (EXPERIMENTAL)"
+ tristate "AT1700/1720 support (EXPERIMENTAL)"
depends on NET_ETHERNET && (ISA || MCA_LEGACY) && EXPERIMENTAL
select CRC32
---help---
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
