summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2004-02-17 19:15:56 -0800
committerAdam Belay <ambx1@neo.rr.com>2004-02-17 19:15:56 -0800
commit0bbdeef9ab2ad42445bcd0a9150e47236ce269a5 (patch)
treee0a0902e25d76f9ddf943c86b2fbd65df37ff43a /include/linux
parent857bf13c8c7302306a8e642af58d5d9c9d41f3ee (diff)
[PATCH] PCI: Changing 'GALILEO' to 'MARVELL'
I'm working with some Marvell components (formerly Galileo Technologies) and noticed that the entries in include/linux/pci_ids.h have become dated. I have attached a patch that changes 'GALILEO' to 'MARVELL', adds some more devices, and updates the uses of the macros in the code. Please note that the newer marvell parts start with 'MV' instead of 'GT' to represent the new name. Also, I didn't change all uses of galileo to marvell, only the macro in pci_ids.h.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci_ids.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a96b2fbdc511..ea698b19a980 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1422,11 +1422,14 @@
#define PCI_SUBVENDOR_ID_KEYSPAN 0x11a9
#define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334
-#define PCI_VENDOR_ID_GALILEO 0x11ab
-#define PCI_DEVICE_ID_GALILEO_GT64011 0x4146
-#define PCI_DEVICE_ID_GALILEO_GT64111 0x4146
-#define PCI_DEVICE_ID_GALILEO_GT96100 0x9652
-#define PCI_DEVICE_ID_GALILEO_GT96100A 0x9653
+#define PCI_VENDOR_ID_MARVELL 0x11ab
+#define PCI_DEVICE_ID_MARVELL_GT64011 0x4146
+#define PCI_DEVICE_ID_MARVELL_GT64111 0x4146
+#define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
+#define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
+#define PCI_DEVICE_ID_MARVELL_MV64460 0x6480
+#define PCI_DEVICE_ID_MARVELL_GT96100 0x9652
+#define PCI_DEVICE_ID_MARVELL_GT96100A 0x9653
#define PCI_VENDOR_ID_LITEON 0x11ad
#define PCI_DEVICE_ID_LITEON_LNE100TX 0x0002