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 /drivers/pcmcia/cirrus.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 'drivers/pcmcia/cirrus.h')
| -rw-r--r-- | drivers/pcmcia/cirrus.h | 10 |
1 files changed, 0 insertions, 10 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 */ |