Automerge with /usr/src/ntfs-2.6.git.

1 files changed, 51 insertions, 0 deletions

diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 74a8227256aa..597c4586d049 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -608,6 +608,56 @@ static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
         " (David Gibson <hermes@gibson.dropbear.id.au>, "
         "Pavel Roskin <proski@gnu.org>, et al)";
 
+static struct pcmcia_device_id orinoco_cs_ids[] = {
+        PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
+        PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001),
+        PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a),
+        PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x0268, 0x0001),
+        PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0305),
+        PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),
+        PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673),
+        PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001),
+        PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
+        PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021),
+        PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
+        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
+        PCMCIA_DEVICE_PROD_ID12("3Com", "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3),
+        PCMCIA_DEVICE_PROD_ID123("Instant Wireless ", " Network PC CARD", "Version 01.02", 0x11d901af, 0x6e9bd926, 0x4b74baa0),
+        PCMCIA_DEVICE_PROD_ID12("ACTIONTEC", "PRISM Wireless LAN PC Card", 0x393089da, 0xa71e69d5),
+        PCMCIA_DEVICE_PROD_ID12("Avaya Communication", "Avaya Wireless PC Card", 0xd8a43b78, 0x0d341169),
+        PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-PCM-L11G", 0x2decece3, 0xf57ca4b3),
+        PCMCIA_DEVICE_PROD_ID12("Cabletron", "RoamAbout 802.11 DS", 0x32d445f5, 0xedeffd90),
+        PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11", 0x5261440f, 0xa6405584),
+        PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11", 0x5261440f, 0xdf6115f9),
+        PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card", 0x71b18589, 0xf144e3ac),
+        PCMCIA_DEVICE_PROD_ID12("D", "Link DWL-650 11Mbps WLAN Card", 0x71b18589, 0xb6f1b0ab),
+        PCMCIA_DEVICE_PROD_ID12("ELSA", "AirLancer MC-11", 0x4507a33a, 0xef54f0e3),
+        PCMCIA_DEVICE_PROD_ID12("HyperLink", "Wireless PC Card 11Mbps", 0x56cc3f1a, 0x0bcf220c),
+        PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18),
+        PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/IEEE", 0x23eb9949, 0xc562e72a),
+        PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11", 0x481e0094, 0x7360e410),
+        PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11G", 0x481e0094, 0xf57ca4b3),
+        PCMCIA_DEVICE_PROD_ID12("Microsoft", "Wireless Notebook Adapter MN-520", 0x5961bf85, 0x6eec8c01),
+        PCMCIA_DEVICE_PROD_ID12("NCR", "WaveLAN/IEEE", 0x24358cd4, 0xc562e72a),
+        PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401RA Wireless PC", "Card", 0x0306467f, 0x9762e8f1),
+        PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110", 0x209f40ab, 0xd9715264),
+        PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9),
+        PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
+        PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
+        PCMCIA_DEVICE_PROD_ID1("Symbol Technologies", 0x3f02b4d6),
+        PCMCIA_DEVICE_NULL,
+};
+MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_ids);
+
 static struct pcmcia_driver orinoco_driver = {
         .owner          = THIS_MODULE,
         .drv            = {
@@ -615,6 +665,7 @@ static struct pcmcia_driver orinoco_driver = {
         },
         .attach         = orinoco_cs_attach,
         .detach         = orinoco_cs_detach,
+        .id_table       = orinoco_cs_ids,
 };
 
 static int __init