aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide/ide-dma.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-06-28 00:46:46 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-28 00:46:46 -0400
commit2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (patch)
tree575f59b6a0918b11f7c763aecf0c3e70478460d2 /drivers/ide/ide-dma.c
parentad3fee560bc508008b3b2cf6358105c4c7081921 (diff)
parent99f95e5286df2f69edab8a04c7080d986ee4233b (diff)
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r--drivers/ide/ide-dma.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 2d2eefb610d..1e1531334c2 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 [] = {
{ "SAMSUNG CD-ROM SC-148C", "ALL" },
{ "SAMSUNG CD-ROM SC", "ALL" },
{ "SanDisk SDP3B-64" , "ALL" },
- { "SAMSUNG CD-ROM SN-124", "ALL" },
{ "ATAPI CD-ROM DRIVE 40X MAXIMUM", "ALL" },
{ "_NEC DV5800A", "ALL" },
{ NULL , NULL }