diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:58 -0400 |
| commit | d011e151bc5d1a581bf35b492a4fde44d30382b9 (patch) | |
| tree | a912c745d3093127a767b7456c46c517bdc0baf7 /drivers/ide/ide-dma.c | |
| parent | 30b4d6565e4d57c6d03600c7822411c7cac19638 (diff) | |
| parent | 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
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 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 } |