[PATCH] PCI: trivial 2.4/2.6 PCI name change/addition

   This patch renames the PCI-X adapter found in HP zx1 and sx1000
ia64 systems to something more generic and descriptive.  It also
adds an ID for the PCI adapter used in sx1000.  Patches against
2.4.21+ia64 and 2.6.0-test2+ia64 attached.  Thanks,

diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index ded646b3a09966850c0e1a4c0178eda35f1171c3..329fae89489bd72f3b740f2d53f333c15fda7369 100644 (file)
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -398,7 +398,7 @@ hp_zx1_setup (u64 ioc_hpa, u64 lba_hpa)
        bridge->driver = &hp_zx1_driver;
 
        fake_bridge_dev.vendor = PCI_VENDOR_ID_HP;
-       fake_bridge_dev.device = PCI_DEVICE_ID_HP_ZX1_LBA;
+       fake_bridge_dev.device = PCI_DEVICE_ID_HP_PCIX_LBA;
        bridge->dev = &fake_bridge_dev;
 
        return agp_add_bridge(bridge);

diff --git a/drivers/pci/pci.ids b/drivers/pci/pci.ids
index c15f34a019673c940f8154ae8e52a73252f4e660..f1779622302705d366039c3579d886aacc1d5daa 100644 (file)
--- a/drivers/pci/pci.ids
+++ b/drivers/pci/pci.ids
@@ -1286,6 +1286,7 @@
                103c 1226  Keystone SP2
                103c 1227  Powerbar SP2
                103c 1282  Everest SP2
+       1054  PCI Local Bus Adapter
        1064  79C970 PCnet Ethernet Controller
        108b  Visualize FXe
        10c1  NetServer Smart IRQ Router
@@ -1297,7 +1298,7 @@
        121c  NetServer PCI COM Port Decoder
        1229  zx1 System Bus Adapter
        122a  zx1 I/O Controller
-       122e  zx1 Local Bus Adapter
+       122e  PCI-X/AGP Local Bus Adapter
        1290  Auxiliary Diva Serial Port
        2910  E2910A PCIBus Exerciser
        2925  E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a74d999e9b1864bc7e99cce952970c1ab1e80fd4..27e515912d29362923c2b96b62851357013767fd 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -608,6 +608,7 @@
 #define PCI_DEVICE_ID_HP_DIVA_TOSCA1   0x1049
 #define PCI_DEVICE_ID_HP_DIVA_TOSCA2   0x104A
 #define PCI_DEVICE_ID_HP_DIVA_MAESTRO  0x104B
+#define PCI_DEVICE_ID_HP_PCI_LBA       0x1054
 #define PCI_DEVICE_ID_HP_REO_SBA       0x10f0
 #define PCI_DEVICE_ID_HP_REO_IOC       0x10f1
 #define PCI_DEVICE_ID_HP_VISUALIZE_FXE 0x108b
@@ -616,7 +617,7 @@
 #define PCI_DEVICE_ID_HP_DIVA_POWERBAR 0x1227
 #define PCI_DEVICE_ID_HP_ZX1_SBA       0x1229
 #define PCI_DEVICE_ID_HP_ZX1_IOC       0x122a
-#define PCI_DEVICE_ID_HP_ZX1_LBA       0x122e
+#define PCI_DEVICE_ID_HP_PCIX_LBA      0x122e
 #define PCI_DEVICE_ID_HP_SX1000_IOC    0x127c
 #define PCI_DEVICE_ID_HP_DIVA_EVEREST  0x1282
 #define PCI_DEVICE_ID_HP_DIVA_AUX      0x1290