diff options
author | Steve French <sfrench@us.ibm.com> | 2007-10-20 04:26:44 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 04:26:44 +0000 |
commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/zorro/zorro.ids | |
parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
download | linux-748c5151deb56e4b7b5a9b07a884243764933831.tar.gz |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/zorro/zorro.ids')
-rw-r--r-- | drivers/zorro/zorro.ids | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids index 5bd4b05d4c45..560fef2a7b1c 100644 --- a/drivers/zorro/zorro.ids +++ b/drivers/zorro/zorro.ids @@ -295,7 +295,7 @@ 0100 RH 800C [HD Controller] 0200 RH 800C [RAM Expansion] 0861 Kato -# The Rainbow II and III are actually made by Ingenieurbüro Helfrich +# The Rainbow II and III are actually made by Ingenieurbüro Helfrich 2000 Rainbow II [Graphics Card] 2100 Rainbow III [Graphics Card] 8000 Melody MPEG [Audio Card] |