Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

3 files changed, 17 insertions, 2 deletions

diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 8f128541656d..882f53f708df 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -190,7 +190,7 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 
                 /*
                  * EEM packet header format:
-                 * b0..14:      EEM type dependant (Data or Command)
+                 * b0..14:      EEM type dependent (Data or Command)
                  * b15:         bmType
                  */
                 header = get_unaligned_le16(skb->data);
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 7dc84971f26f..ad0298f9b5f9 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -1221,7 +1221,7 @@ static void kaweth_disconnect(struct usb_interface *intf)
 
         usb_set_intfdata(intf, NULL);
         if (!kaweth) {
-                dev_warn(&intf->dev, "unregistering non-existant device\n");
+                dev_warn(&intf->dev, "unregistering non-existent device\n");
                 return;
         }
         netdev = kaweth->net;
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 708f2083898b..24f4b3739dd2 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1268,6 +1268,21 @@ static const struct usb_device_id products[] = {
                 USB_DEVICE(0x0424, 0x9909),
                 .driver_info = (unsigned long) &smsc95xx_info,
         },
+        {
+                /* SMSC LAN9530 USB Ethernet Device */
+                USB_DEVICE(0x0424, 0x9530),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC LAN9730 USB Ethernet Device */
+                USB_DEVICE(0x0424, 0x9730),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
+        {
+                /* SMSC LAN89530 USB Ethernet Device */
+                USB_DEVICE(0x0424, 0x9E08),
+                .driver_info = (unsigned long) &smsc95xx_info,
+        },
         { },            /* END */
 };
 MODULE_DEVICE_TABLE(usb, products);