Commit bb015f0c authored by Wolfram Sang's avatar Wolfram Sang Committed by Dominik Brodowski
Browse files

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: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 94efb723

drivers/pcmcia/cirrus.h

+0 −10
Original line number Diff line number Diff line
@@ -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 */

drivers/pcmcia/o2micro.h

+0 −22
Original line number Diff line number Diff line
@@ -30,28 +30,6 @@ 
#ifndef _LINUX_O2MICRO_H

#define _LINUX_O2MICRO_H



#ifndef PCI_VENDOR_ID_O2

#define PCI_VENDOR_ID_O2		0x1217

#endif

#ifndef PCI_DEVICE_ID_O2_6729

#define PCI_DEVICE_ID_O2_6729		0x6729

#endif

#ifndef PCI_DEVICE_ID_O2_6730

#define PCI_DEVICE_ID_O2_6730		0x673a

#endif

#ifndef PCI_DEVICE_ID_O2_6832

#define PCI_DEVICE_ID_O2_6832		0x6832

#endif

#ifndef PCI_DEVICE_ID_O2_6836

#define PCI_DEVICE_ID_O2_6836		0x6836

#endif

#ifndef PCI_DEVICE_ID_O2_6812

#define PCI_DEVICE_ID_O2_6812		0x6872

#endif

#ifndef PCI_DEVICE_ID_O2_6933

#define PCI_DEVICE_ID_O2_6933           0x6933

#endif



/* Additional PCI configuration registers */



#define O2_MUX_CONTROL		0x90	/* 32 bit */

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -1632,6 +1632,8 @@ 
#define PCI_DEVICE_ID_O2_6730		0x673a

#define PCI_DEVICE_ID_O2_6832		0x6832

#define PCI_DEVICE_ID_O2_6836		0x6836

#define PCI_DEVICE_ID_O2_6812		0x6872

#define PCI_DEVICE_ID_O2_6933		0x6933



#define PCI_VENDOR_ID_3DFX		0x121a

#define PCI_DEVICE_ID_3DFX_VOODOO	0x0001

CRA Git | Maintained and supported by SUSTech CRA and CCSE