From 90354a747697b1562acabaf0219b1b209ada130c Mon Sep 17 00:00:00 2001
From: Conke Hu <conke.hu@amd.com>
Date: Sat, 27 Jan 2007 13:46:28 +0100
Subject: [PATCH] --- yaml --- r: 45962 b: refs/heads/master c:
 737153298023342073ccaa006144dd254b298e2b h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/ide/pci/atiixp.c | 21 +--------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 59256ba413f8..a386f344b52c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a51545ab2523b9cfd426737495f877821006371a
+refs/heads/master: 737153298023342073ccaa006144dd254b298e2b
diff --git a/trunk/drivers/ide/pci/atiixp.c b/trunk/drivers/ide/pci/atiixp.c
index 524e65de4398..148af8ab518f 100644
--- a/trunk/drivers/ide/pci/atiixp.c
+++ b/trunk/drivers/ide/pci/atiixp.c
@@ -320,19 +320,6 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
 	hwif->drives[0].autodma = hwif->autodma;
 }
 
-static void __devinit init_hwif_sb600_legacy(ide_hwif_t *hwif)
-{
-
-	hwif->atapi_dma = 1;
-	hwif->ultra_mask = 0x7f;
-	hwif->mwdma_mask = 0x07;
-	hwif->swdma_mask = 0x07;
-
-	if (!noautodma)
-		hwif->autodma = 1;
-	hwif->drives[0].autodma = hwif->autodma;
-	hwif->drives[1].autodma = hwif->autodma;
-}
 
 static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
 	{	/* 0 */
@@ -342,13 +329,7 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
 		.autodma	= AUTODMA,
 		.enablebits	= {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
 		.bootable	= ON_BOARD,
-	},{	/* 1 */
-		.name		= "ATI SB600 SATA Legacy IDE",
-		.init_hwif	= init_hwif_sb600_legacy,
-		.channels	= 2,
-		.autodma	= AUTODMA,
-		.bootable	= ON_BOARD,
-	}
+	},
 };
 
 /**