diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2009-10-19 05:43:32 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-10-24 11:13:01 -0400 |
commit | bb015f0c85362aa767f8f00f50a40d85e489414f (patch) | |
tree | 8f45c92a354d02f2d25c451a83398886cd78bc1c /include/linux/pci_ids.h | |
parent | 94efb72328afa29ea5fd93e48ed17489afcdaa12 (diff) |
pcmcia: drop already defined PCI_IDs
Out of 10 PCI_IDs found in the PCMCIA subsystem, only two were not defined in
pci_ids.h. Move them and drop the duplicates. Successfully build-tested.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f490e7a7307a..857cc349bf71 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1632,6 +1632,8 @@ | |||
1632 | #define PCI_DEVICE_ID_O2_6730 0x673a | 1632 | #define PCI_DEVICE_ID_O2_6730 0x673a |
1633 | #define PCI_DEVICE_ID_O2_6832 0x6832 | 1633 | #define PCI_DEVICE_ID_O2_6832 0x6832 |
1634 | #define PCI_DEVICE_ID_O2_6836 0x6836 | 1634 | #define PCI_DEVICE_ID_O2_6836 0x6836 |
1635 | #define PCI_DEVICE_ID_O2_6812 0x6872 | ||
1636 | #define PCI_DEVICE_ID_O2_6933 0x6933 | ||
1635 | 1637 | ||
1636 | #define PCI_VENDOR_ID_3DFX 0x121a | 1638 | #define PCI_VENDOR_ID_3DFX 0x121a |
1637 | #define PCI_DEVICE_ID_3DFX_VOODOO 0x0001 | 1639 | #define PCI_DEVICE_ID_3DFX_VOODOO 0x0001 |