From 03d5fce084ab917d4352701ddf6aebd389e09ee0 Mon Sep 17 00:00:00 2001
From: Joerg Albert <jal2@gmx.de>
Date: Sun, 13 Jun 2010 14:22:23 +0200
Subject: [PATCH] --- yaml --- r: 200522 b: refs/heads/master c:
 50900f1698f68127e54c67fdfe829e4a97b1be2b h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/wireless/p54/p54pci.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 542e079377a0..aba372d3c56a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13deb23a52c13053fc509f119eb80b903c65a879
+refs/heads/master: 50900f1698f68127e54c67fdfe829e4a97b1be2b
diff --git a/trunk/drivers/net/wireless/p54/p54pci.c b/trunk/drivers/net/wireless/p54/p54pci.c
index 07c4528f6e6b..a5ea89cde8c4 100644
--- a/trunk/drivers/net/wireless/p54/p54pci.c
+++ b/trunk/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) },
 	{ },
 };