aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorTomas Kovacik <nail@nodomain.sk>2009-07-26 16:04:58 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 13:17:16 -0400
commit1ff84890b62b20823b3697a6041bbec1b5280cee (patch)
treeb6b4181247807a60327018e0e6b1d6bc7b4f78c4 /drivers/pcmcia
parentb4b3d7bbe1e1d924dc5f3b48b6c06977aee2d494 (diff)
pcmcia: disable prefetch/burst for OZ6933
Problems have been reported [1], so disable prefetch/burst, to be on the safe side. [1] http://www.mail-archive.com/linux-pcmcia@lists.infradead.org/msg02048.html Signed-off-by: Tomáš Kováčik <nail@nodomain.sk> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/o2micro.h4
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 @@
48#ifndef PCI_DEVICE_ID_O2_6812 48#ifndef PCI_DEVICE_ID_O2_6812
49#define PCI_DEVICE_ID_O2_6812 0x6872 49#define PCI_DEVICE_ID_O2_6812 0x6872
50#endif 50#endif
51#ifndef PCI_DEVICE_ID_O2_6933
52#define PCI_DEVICE_ID_O2_6933 0x6933
53#endif
51 54
52/* Additional PCI configuration registers */ 55/* Additional PCI configuration registers */
53 56
@@ -154,6 +157,7 @@ static int o2micro_override(struct yenta_socket *socket)
154 case PCI_DEVICE_ID_O2_6812: 157 case PCI_DEVICE_ID_O2_6812:
155 case PCI_DEVICE_ID_O2_6832: 158 case PCI_DEVICE_ID_O2_6832:
156 case PCI_DEVICE_ID_O2_6836: 159 case PCI_DEVICE_ID_O2_6836:
160 case PCI_DEVICE_ID_O2_6933:
157 dev_printk(KERN_INFO, &socket->dev->dev, 161 dev_printk(KERN_INFO, &socket->dev->dev,
158 "Yenta O2: old bridge, disabling read " 162 "Yenta O2: old bridge, disabling read "
159 "prefetch/write burst\n"); 163 "prefetch/write burst\n");