summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/cirrus.h
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2009-10-19 13:43:32 +0400
committerDominik Brodowski <linux@dominikbrodowski.net>2009-10-24 19:13:01 +0400
commitbb015f0c85362aa767f8f00f50a40d85e489414f (patch)
tree8f45c92a354d02f2d25c451a83398886cd78bc1c /drivers/pcmcia/cirrus.h
parent94efb72328afa29ea5fd93e48ed17489afcdaa12 (diff)
downloadlinux-bb015f0c85362aa767f8f00f50a40d85e489414f.tar.xz
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.h10
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 @@
#ifndef _LINUX_CIRRUS_H
#define _LINUX_CIRRUS_H
-#ifndef PCI_VENDOR_ID_CIRRUS
-#define PCI_VENDOR_ID_CIRRUS 0x1013
-#endif
-#ifndef PCI_DEVICE_ID_CIRRUS_6729
-#define PCI_DEVICE_ID_CIRRUS_6729 0x1100
-#endif
-#ifndef PCI_DEVICE_ID_CIRRUS_6832
-#define PCI_DEVICE_ID_CIRRUS_6832 0x1110
-#endif
-
#define PD67_MISC_CTL_1 0x16 /* Misc control 1 */
#define PD67_FIFO_CTL 0x17 /* FIFO control */
#define PD67_MISC_CTL_2 0x1E /* Misc control 2 */