Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / p54usb.c

diff --git a/drivers/net/wireless/p54usb.c b/drivers/net/wireless/p54usb.c
index 7446c39ce5d069a66212ca21a47972898177d240..60d286eb0b8bd22e3f04d9ab2258c88cf99a4605 100644 (file)
--- a/drivers/net/wireless/p54usb.c
+++ b/drivers/net/wireless/p54usb.c
@@ -62,6 +62,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
        {USB_DEVICE(0x0cde, 0x0008)},   /* Sagem XG703A */
        {USB_DEVICE(0x0d8e, 0x3762)},   /* DLink DWL-G120 Cohiba */
        {USB_DEVICE(0x09aa, 0x1000)},   /* Spinnaker Proto board */
+       {USB_DEVICE(0x13B1, 0x000C)},   /* Linksys WUSB54AG */
        {USB_DEVICE(0x1435, 0x0427)},   /* Inventel UR054G */
        {USB_DEVICE(0x2001, 0x3704)},   /* DLink DWL-G122 rev A2 */
        {USB_DEVICE(0x413c, 0x8102)},   /* Spinnaker DUT */
@@ -307,7 +308,7 @@ static int p54u_read_eeprom(struct ieee80211_hw *dev)
 
        buf = kmalloc(0x2020, GFP_KERNEL);
        if (!buf) {
-               printk(KERN_ERR "prism54usb: cannot allocate memory for"
+               printk(KERN_ERR "prism54usb: cannot allocate memory for "
                       "eeprom readback!\n");
                return -ENOMEM;
        }