diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:46 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:46 -0400 |
commit | 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (patch) | |
tree | 575f59b6a0918b11f7c763aecf0c3e70478460d2 /drivers/ide/ide-dma.c | |
parent | ad3fee560bc508008b3b2cf6358105c4c7081921 (diff) | |
parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 2d2eefb610dd..1e1531334c25 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -132,7 +132,6 @@ static const struct drive_list_entry drive_blacklist [] = { | |||
132 | { "SAMSUNG CD-ROM SC-148C", "ALL" }, | 132 | { "SAMSUNG CD-ROM SC-148C", "ALL" }, |
133 | { "SAMSUNG CD-ROM SC", "ALL" }, | 133 | { "SAMSUNG CD-ROM SC", "ALL" }, |
134 | { "SanDisk SDP3B-64" , "ALL" }, | 134 | { "SanDisk SDP3B-64" , "ALL" }, |
135 | { "SAMSUNG CD-ROM SN-124", "ALL" }, | ||
136 | { "ATAPI CD-ROM DRIVE 40X MAXIMUM", "ALL" }, | 135 | { "ATAPI CD-ROM DRIVE 40X MAXIMUM", "ALL" }, |
137 | { "_NEC DV5800A", "ALL" }, | 136 | { "_NEC DV5800A", "ALL" }, |
138 | { NULL , NULL } | 137 | { NULL , NULL } |