diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2010-06-07 15:13:46 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-07 15:13:46 -0400 |
| commit | 9d88477c41904127ab9ae1f3b5b4a39bf6474043 (patch) | |
| tree | f50d5185ac89a9fd76d7cb087b952d5c55d5063b /drivers/net/wireless/p54/p54usb.c | |
| parent | mac80211: fix lock leak w/ ARP filtering and w/o CONFIG_INET (diff) | |
| parent | mac80211: fix function pointer check (diff) | |
| download | linux-dev-9d88477c41904127ab9ae1f3b5b4a39bf6474043.tar.xz linux-dev-9d88477c41904127ab9ae1f3b5b4a39bf6474043.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/p54/p54usb.c')
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index a06862130703..b0318ea59b7f 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -80,6 +80,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { {USB_DEVICE(0x1413, 0x5400)}, /* Telsey 802.11g USB2.0 Adapter */ {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ {USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */ + {USB_DEVICE(0x413c, 0x5513)}, /* Dell WLA3310 USB Wireless Adapter */ {USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */ {USB_DEVICE(0x413c, 0x8104)}, /* Cohiba Proto board */ {} |