diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 19:11:23 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-16 19:11:23 +0400 |
| commit | 0950efd1a1490e869d19ec631eed75ef57772f8b (patch) | |
| tree | ee1138885190a3c7f6a0631c118ebb4ecbd3cb7a /drivers/pcmcia/o2micro.h | |
| parent | 4406c56d0a4da7a37b9180abeaece6cd00bcc874 (diff) | |
| parent | 889c27744c30eb7a43b68c11e33e679cfafc8cd5 (diff) | |
| download | linux-0950efd1a1490e869d19ec631eed75ef57772f8b.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6:
pcmcia: document return value of pcmcia_loop_config
pcmcia: dtl1_cs: fix pcmcia_loop_config logic
pcmcia: drop non-existant includes
pcmcia: disable prefetch/burst for OZ6933
pcmcia: fix incorrect argument order to list_add_tail()
pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
pcmcia: Use phys_addr_t for physical addresses
pcmcia: drivers/pcmcia: Make static
Diffstat (limited to 'drivers/pcmcia/o2micro.h')
| -rw-r--r-- | drivers/pcmcia/o2micro.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h index 5554015a7813..72188c462c9c 100644 --- a/drivers/pcmcia/o2micro.h +++ b/drivers/pcmcia/o2micro.h @@ -48,6 +48,9 @@ #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 */ @@ -154,6 +157,7 @@ static int o2micro_override(struct yenta_socket *socket) case PCI_DEVICE_ID_O2_6812: case PCI_DEVICE_ID_O2_6832: case PCI_DEVICE_ID_O2_6836: + case PCI_DEVICE_ID_O2_6933: dev_printk(KERN_INFO, &socket->dev->dev, "Yenta O2: old bridge, disabling read " "prefetch/write burst\n"); |