summaryrefslogtreecommitdiffstats
path: root/drivers/zorro
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-22 12:17:26 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-22 12:17:26 +0100
commitf9b44121b34174ae4f243a568393fc3225842e75 (patch)
tree943f68cd7458d08a9e8809ed0a10b71b23911f3e /drivers/zorro
parentASoC: pxa-pcm-lib: initialize DMA channel to -1 (diff)
parentLinux 2.6.34-rc2 (diff)
downloadlinux-f9b44121b34174ae4f243a568393fc3225842e75.tar.xz
linux-f9b44121b34174ae4f243a568393fc3225842e75.zip
Merge commit 'v2.6.34-rc2' into for-2.6.34
Diffstat (limited to 'drivers/zorro')
-rw-r--r--drivers/zorro/zorro.ids2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids
index 0c0f99e2dd62..de24e3decedd 100644
--- a/drivers/zorro/zorro.ids
+++ b/drivers/zorro/zorro.ids
@@ -108,7 +108,7 @@
0c00 500XP/SupraDrive WordSync [SCSI Host Adapter]
0d00 SupraDrive WordSync II [SCSI Host Adapter]
1000 2400zi+ [Modem]
-0422 Computer Systems Assosiates
+0422 Computer Systems Associates
1100 Magnum 40 [Accelerator and SCSI Host Adapter]
1500 12 Gauge [SCSI Host Adapter]
0439 Marc Michael Groth