tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Wolfram Sang and committed by
Dominik Brodowski bb015f0c 94efb723

+2 -32
-10
drivers/pcmcia/cirrus.h
··· 30 30 #ifndef _LINUX_CIRRUS_H 31 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 33 #define PD67_MISC_CTL_1 0x16 /* Misc control 1 */ 44 34 #define PD67_FIFO_CTL 0x17 /* FIFO control */ 45 35 #define PD67_MISC_CTL_2 0x1E /* Misc control 2 */
-22
drivers/pcmcia/o2micro.h
··· 30 30 #ifndef _LINUX_O2MICRO_H 31 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 33 /* Additional PCI configuration registers */ 56 34 57 35 #define O2_MUX_CONTROL 0x90 /* 32 bit */
+2
include/linux/pci_ids.h
··· 1632 1632 #define PCI_DEVICE_ID_O2_6730 0x673a 1633 1633 #define PCI_DEVICE_ID_O2_6832 0x6832 1634 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 1638 #define PCI_VENDOR_ID_3DFX 0x121a 1637 1639 #define PCI_DEVICE_ID_3DFX_VOODOO 0x0001