diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2010-06-17 16:21:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-17 16:21:14 -0400 |
| commit | abf52f86aa0a49a7377350cafa8f218c4cd227e7 (patch) | |
| tree | dd9549023a99d37fb1bbcbaad9c10ae102a1882e /drivers/net/wireless/p54/p54pci.c | |
| parent | ath5k: report PHY error frames only for chips which need it (diff) | |
| parent | mac80211: fix warn, enum may be used uninitialized (diff) | |
| download | linux-dev-abf52f86aa0a49a7377350cafa8f218c4cd227e7.tar.xz linux-dev-abf52f86aa0a49a7377350cafa8f218c4cd227e7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/net/wireless/p54/p54pci.c')
| -rw-r--r-- | drivers/net/wireless/p54/p54pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index 07c4528f6e6b..a5ea89cde8c4 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c @@ -41,6 +41,8 @@ static DEFINE_PCI_DEVICE_TABLE(p54p_table) = { { PCI_DEVICE(0x1260, 0x3877) }, /* Intersil PRISM Javelin/Xbow Wireless LAN adapter */ { PCI_DEVICE(0x1260, 0x3886) }, + /* Intersil PRISM Xbow Wireless LAN adapter (Symbol AP-300) */ + { PCI_DEVICE(0x1260, 0xffff) }, { }, }; |