diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /drivers/pcmcia/o2micro.h | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'drivers/pcmcia/o2micro.h')
| -rw-r--r-- | drivers/pcmcia/o2micro.h | 22 |
1 files changed, 0 insertions, 22 deletions
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 */ |