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 | |
| 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>
| -rw-r--r-- | drivers/pcmcia/cirrus.h | 10 | ||||
| -rw-r--r-- | drivers/pcmcia/o2micro.h | 22 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
3 files changed, 2 insertions, 32 deletions
diff --git a/drivers/pcmcia/cirrus.h b/drivers/pcmcia/cirrus.h index ecd4fc7f666f..446a4576e73e 100644 --- a/drivers/pcmcia/cirrus.h +++ b/drivers/pcmcia/cirrus.h | |||
| @@ -30,16 +30,6 @@ | |||
| 30 | #ifndef _LINUX_CIRRUS_H | 30 | #ifndef _LINUX_CIRRUS_H |
| 31 | #define _LINUX_CIRRUS_H | 31 | #define _LINUX_CIRRUS_H |
| 32 | 32 | ||
| 33 | #ifndef PCI_VENDOR_ID_CIRRUS | ||
| 34 | #define PCI_VENDOR_ID_CIRRUS 0x1013 | ||
| 35 | #endif | ||
| 36 | #ifndef PCI_DEVICE_ID_CIRRUS_6729 | ||
| 37 | #define PCI_DEVICE_ID_CIRRUS_6729 0x1100 | ||
| 38 | #endif | ||
| 39 | #ifndef PCI_DEVICE_ID_CIRRUS_6832 | ||
| 40 | #define PCI_DEVICE_ID_CIRRUS_6832 0x1110 | ||
| 41 | #endif | ||
| 42 | |||
| 43 | #define PD67_MISC_CTL_1 0x16 /* Misc control 1 */ | 33 | #define PD67_MISC_CTL_1 0x16 /* Misc control 1 */ |
| 44 | #define PD67_FIFO_CTL 0x17 /* FIFO control */ | 34 | #define PD67_FIFO_CTL 0x17 /* FIFO control */ |
| 45 | #define PD67_MISC_CTL_2 0x1E /* Misc control 2 */ | 35 | #define PD67_MISC_CTL_2 0x1E /* Misc control 2 */ |
diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h index 72188c462c9c..624442fc0d35 100644 --- a/drivers/pcmcia/o2micro.h +++ b/drivers/pcmcia/o2micro.h | |||
| @@ -30,28 +30,6 @@ | |||
| 30 | #ifndef _LINUX_O2MICRO_H | 30 | #ifndef _LINUX_O2MICRO_H |
| 31 | #define _LINUX_O2MICRO_H | 31 | #define _LINUX_O2MICRO_H |
| 32 | 32 | ||
| 33 | #ifndef PCI_VENDOR_ID_O2 | ||
| 34 | #define PCI_VENDOR_ID_O2 0x1217 | ||
| 35 | #endif | ||
| 36 | #ifndef PCI_DEVICE_ID_O2_6729 | ||
| 37 | #define PCI_DEVICE_ID_O2_6729 0x6729 | ||
| 38 | #endif | ||
| 39 | #ifndef PCI_DEVICE_ID_O2_6730 | ||
| 40 | #define PCI_DEVICE_ID_O2_6730 0x673a | ||
| 41 | #endif | ||
| 42 | #ifndef PCI_DEVICE_ID_O2_6832 | ||
| 43 | #define PCI_DEVICE_ID_O2_6832 0x6832 | ||
| 44 | #endif | ||
| 45 | #ifndef PCI_DEVICE_ID_O2_6836 | ||
| 46 | #define PCI_DEVICE_ID_O2_6836 0x6836 | ||
| 47 | #endif | ||
| 48 | #ifndef PCI_DEVICE_ID_O2_6812 | ||
| 49 | #define PCI_DEVICE_ID_O2_6812 0x6872 | ||
| 50 | #endif | ||
| 51 | #ifndef PCI_DEVICE_ID_O2_6933 | ||
| 52 | #define PCI_DEVICE_ID_O2_6933 0x6933 | ||
| 53 | #endif | ||
| 54 | |||
| 55 | /* Additional PCI configuration registers */ | 33 | /* Additional PCI configuration registers */ |
| 56 | 34 | ||
| 57 | #define O2_MUX_CONTROL 0x90 /* 32 bit */ | 35 | #define O2_MUX_CONTROL 0x90 /* 32 bit */ |
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 |