Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 161930
b: refs/heads/master
c: 1ff8489
h: refs/heads/master
v: v3
  • Loading branch information
Tomas Kovacik authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 8e9e6fb commit a600cb6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b4b3d7bbe1e1d924dc5f3b48b6c06977aee2d494
refs/heads/master: 1ff84890b62b20823b3697a6041bbec1b5280cee
4 changes: 4 additions & 0 deletions trunk/drivers/pcmcia/o2micro.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit a600cb6

Please sign in to comment.