From c3a8f639ccf20233181686e86fe5cf46de6fa183 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Mon, 27 Jun 2005 15:24:24 -0700
Subject: [PATCH] --- yaml --- r: 3733 b: refs/heads/master c:
 58ecd15652979f2001dc296dcfd303cc1bd33ce7 h: refs/heads/master i:   3731:
 0162e197e95e803c8300d8442ddfdc6d039de19d v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ide/ide-dma.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 844163ee754d..49b24c301ebb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6efd936046b123303ace4330fd2f26195ad7b1c4
+refs/heads/master: 58ecd15652979f2001dc296dcfd303cc1bd33ce7
diff --git a/trunk/drivers/ide/ide-dma.c b/trunk/drivers/ide/ide-dma.c
index 2d2eefb610dd..1e1531334c25 100644
--- a/trunk/drivers/ide/ide-dma.c
+++ b/trunk/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		}