diff --git a/[refs] b/[refs] index 277b4776b8f8..e0d993d6cd94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9fc25108995f1f59ee30026818d7ec2bb016fbe +refs/heads/master: f04e3f092a855ce798f274b38712b90d51b73bca diff --git a/trunk/drivers/net/3c509.c b/trunk/drivers/net/3c509.c index e843109d4f62..977935a3d898 100644 --- a/trunk/drivers/net/3c509.c +++ b/trunk/drivers/net/3c509.c @@ -217,6 +217,7 @@ static void el3_poll_controller(struct net_device *dev); static struct eisa_device_id el3_eisa_ids[] = { { "TCM5092" }, { "TCM5093" }, + { "TCM5095" }, { "" } }; diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index fa9f76c953dd..47e158fa5aac 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -1488,14 +1488,14 @@ config 8139CP will be called 8139cp. This is recommended. config 8139TOO - tristate "RealTek RTL-8139 PCI Fast Ethernet Adapter support" + tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support" depends on NET_PCI && PCI select CRC32 select MII ---help--- This is a driver for the Fast Ethernet PCI network cards based on - the RTL8139 chips. If you have one of those, say Y and read - the Ethernet-HOWTO . + the RTL 8129/8130/8139 chips. If you have one of those, say Y and + read the Ethernet-HOWTO . To compile this driver as a module, choose M here: the module will be called 8139too. This is recommended.