From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: linux-ia64@vger.kernel.org
Subject: Re: [PATCH] trivial 2.4/2.6 PCI name change/addition
Date: Wed, 06 Aug 2003 22:13:26 +0000 [thread overview]
Message-ID: <marc-linux-ia64-106020816229874@msgid-missing> (raw)
In-Reply-To: <marc-linux-ia64-106019991620116@msgid-missing>
On Wednesday 06 August 2003 1:54 pm, Alex Williamson wrote:
> 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,
I applied this for the 2.4 ia64 patch.
Marcelo, do we need to do anything else to get this in your tree?
--- linux-2.4.21/include/linux/pci_ids.h~ 2003-08-06 13:18:56.000000000 -0600
+++ linux-2.4.21/include/linux/pci_ids.h 2003-08-06 13:19:07.000000000 -0600
@@ -539,11 +539,12 @@
#define PCI_DEVICE_ID_HP_DIVA1 0x1049
#define PCI_DEVICE_ID_HP_DIVA2 0x104A
#define PCI_DEVICE_ID_HP_SP2_0 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_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_VENDOR_ID_PCTECH 0x1042
--- linux-2.4.21/drivers/pci/pci.ids~ 2003-08-06 13:18:30.000000000 -0600
+++ linux-2.4.21/drivers/pci/pci.ids 2003-08-06 13:19:07.000000000 -0600
@@ -1212,6 +1212,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
@@ -1223,7 +1224,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
--- linux-2.4.21/drivers/char/agp/agpgart_be.c~ 2003-08-06 13:18:20.000000000 -0600
+++ linux-2.4.21/drivers/char/agp/agpgart_be.c 2003-08-06 13:19:07.000000000 -0600
@@ -4853,7 +4853,7 @@
agp_bridge.type = HP_ZX1;
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;
return hp_zx1_ioc_init(ioc_hpa, lba_hpa);
}
next prev parent reply other threads:[~2003-08-06 22:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-08-06 19:54 [PATCH] trivial 2.4/2.6 PCI name change/addition Alex Williamson
2003-08-06 22:13 ` Bjorn Helgaas [this message]
2003-08-06 23:09 ` Greg KH
2003-08-07 12:05 ` Marcelo Tosatti
2003-08-07 12:32 ` Marcelo Tosatti
2003-08-07 15:52 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=marc-linux-ia64-106020816229874@msgid-missing \
--to=bjorn.helgaas@hp.com \
--cc=linux-ia64@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox