bk://kernel.bkbits.net/gregkh/linux/pci-2.6 roland@topspin.com|ChangeSet|20040519065717|56508 roland # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/05/18 23:59:20-07:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # include/linux/pci_ids.h # 2004/05/18 23:59:16-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/pci.ids # 2004/05/18 23:59:16-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/05/18 23:58:09-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # include/linux/pci_ids.h # 2004/05/18 23:58:06-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/pci.ids # 2004/05/18 23:58:06-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/05/18 23:57:17-07:00 roland@topspin.com # [PATCH] PCI: Add InfiniBand HCA IDs to pci_ids.h # # Add InfiniBand HCA IDs to pci_ids.h. # # include/linux/pci_ids.h # 2004/05/18 14:50:17-07:00 roland@topspin.com +7 -0 # PCI: Add InfiniBand HCA IDs to pci_ids.h # # ChangeSet # 2004/05/18 23:56:57-07:00 greg@kroah.com # [PATCH] PCI: fix up build warnings in pci.ids file. # # drivers/pci/pci.ids # 2004/05/18 23:38:25-07:00 greg@kroah.com +4 -4 # PCI: fix up build warnings in pci.ids file. # # ChangeSet # 2004/05/18 14:47:20-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # include/linux/pci_ids.h # 2004/05/18 14:47:17-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/pci.ids # 2004/05/18 14:47:17-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/hotplug/shpchp_ctrl.c # 2004/05/18 14:47:17-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/pci/irq.c # 2004/05/18 14:47:17-07:00 akpm@bix.(none) +0 -0 # Auto merged # # CREDITS # 2004/05/18 14:47:17-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/05/16 01:45:58-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # include/linux/pci_ids.h # 2004/05/16 01:45:54-07:00 akpm@bix.(none) +0 -1 # Auto merged # # arch/i386/pci/irq.c # 2004/05/16 01:45:54-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/05/14 22:08:26-07:00 akpm@bix.(none) # resolve conflicts # # drivers/pci/pci.ids # 2004/05/14 22:08:21-07:00 akpm@bix.(none) +0 -2 # resolve conflicts # # include/linux/pci_ids.h # 2004/05/14 22:06:08-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/hotplug/shpchp_ctrl.c # 2004/05/14 22:06:08-07:00 akpm@bix.(none) +0 -1 # Auto merged # # arch/i386/pci/irq.c # 2004/05/14 22:06:08-07:00 akpm@bix.(none) +0 -0 # Auto merged # # CREDITS # 2004/05/14 22:06:08-07:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/drivers/pci/pci.ids b/drivers/pci/pci.ids --- a/drivers/pci/pci.ids Wed May 19 00:00:02 2004 +++ b/drivers/pci/pci.ids Wed May 19 00:00:02 2004 @@ -2331,7 +2331,7 @@ c801 PCI-GPIB c831 PCI-GPIB bridge 1094 First International Computers [FIC] -1095 Silicon Image, Inc. (formerly CMD Technology Inc) +1095 Silicon Image, Inc. 0240 Adaptec AAR-1210SA SATA HostRAID Controller 0640 PCI0640 0643 PCI0643 @@ -5155,7 +5155,7 @@ 9132 Ethernet 100/10 MBit 1283 Integrated Technology Express, Inc. 673a IT8330G - 8212 IT/ITE8212 Dual channel ATA RAID controller (PCI version seems to be IT8212, embedded seems to be ITE8212) + 8212 IT/ITE8212 Dual channel ATA RAID controller 8330 IT8330G 8872 IT8874F PCI Dual Serial Port Controller 8888 IT8888F PCI to ISA Bridge with SMB @@ -6098,7 +6098,7 @@ 0340 PC4800 0350 PC4800 4500 PC4500 - 4800 Cisco Aironet 340 802.11b Wireless LAN Adapter/Aironet PC4800 + 4800 Cisco Aironet 340 802.11b Wireless LAN Adapter a504 Cisco Aironet Wireless 802.11b a505 Cisco Aironet CB20a 802.11a Wireless LAN Adapter 14ba INTERNIX Inc. @@ -6824,7 +6824,7 @@ 1629 Kongsberg Spacetec AS 1003 Format synchronizer v3.0 2002 Fast Universal Data Output -1638 Standard Microsystems Corp [SMC] +1638 SMC 1100 SMC2602W EZConnect / Addtron AWA-100 / Eumitcom PCI WL11000 163c Smart Link Ltd. 3052 SmartLink SmartPCI562 56K Modem diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h Wed May 19 00:00:02 2004 +++ b/include/linux/pci_ids.h Wed May 19 00:00:02 2004 @@ -1870,6 +1870,11 @@ #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 +#define PCI_VENDOR_ID_MELLANOX 0x15b3 +#define PCI_DEVICE_ID_MELLANOX_TAVOR 0x5a44 +#define PCI_DEVICE_ID_MELLANOX_ARBEL_COMPAT 0x6278 +#define PCI_DEVICE_ID_MELLANOX_ARBEL 0x6282 + #define PCI_VENDOR_ID_PDC 0x15e9 #define PCI_DEVICE_ID_PDC_1841 0x1841 @@ -1890,6 +1895,8 @@ #define PCI_VENDOR_ID_S2IO 0x17d5 #define PCI_DEVICE_ID_S2IO_WIN 0x5731 #define PCI_DEVICE_ID_S2IO_UNI 0x5831 + +#define PCI_VENDOR_ID_TOPSPIN 0x1867 #define PCI_VENDOR_ID_ARC 0x192E #define PCI_DEVICE_ID_ARC_EHCI 0x0101