From 1486be39840a0e1698c9e525712d45cad77b7260 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Wed, 14 May 2008 23:06:16 +0200
Subject: [PATCH] --- yaml --- r: 96723 b: refs/heads/master c:
 e7f379d5cabb2790ecce5d623382fa6085e7686d h: refs/heads/master i:   96721:
 01ece6a34c1be1032bbbd56c8d5198f8b39337ed   96719:
 de56e6c749228f03ae1d1b2b98b643543f3dd930 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/ide/Kconfig        | 15 ---------------
 trunk/drivers/ide/pci/alim15x3.c |  4 ----
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 9a7637be839d..ad298ef65230 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63b1623ef0e33160d782fd1b0044e9a8af5d16cf
+refs/heads/master: e7f379d5cabb2790ecce5d623382fa6085e7686d
diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
index f702f9152ce6..627f08e93e0a 100644
--- a/trunk/drivers/ide/Kconfig
+++ b/trunk/drivers/ide/Kconfig
@@ -463,21 +463,6 @@ config BLK_DEV_ALI15X3
 
 	  If unsure, say N.
 
-config WDC_ALI15X3
-	bool "ALI M15x3 WDC support (DANGEROUS)"
-	depends on BLK_DEV_ALI15X3
-	---help---
-	  This allows for UltraDMA support for WDC drives that ignore CRC
-	  checking. You are a fool for enabling this option, but there have
-	  been requests. DO NOT COMPLAIN IF YOUR DRIVE HAS FS CORRUPTION, IF
-	  YOU ENABLE THIS! No one will listen, just laugh for ignoring this
-	  SERIOUS WARNING.
-
-	  Using this option can allow WDC drives to run at ATA-4/5 transfer
-	  rates with only an ATA-2 support structure.
-
-	  SAY N!
-
 config BLK_DEV_AMD74XX
 	tristate "AMD and nVidia IDE support"
 	depends on !ARM
diff --git a/trunk/drivers/ide/pci/alim15x3.c b/trunk/drivers/ide/pci/alim15x3.c
index 3eaab542c41a..f2129d5e07f2 100644
--- a/trunk/drivers/ide/pci/alim15x3.c
+++ b/trunk/drivers/ide/pci/alim15x3.c
@@ -127,8 +127,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
  *		No UDMA on revisions <= 0x20
  *		Disk only for revisions < 0xC2
  *		Not WDC drives on M1543C-E (?)
- *
- *	FIXME: WDC ifdef needs to die
  */
 
 static u8 ali_udma_filter(ide_drive_t *drive)
@@ -136,11 +134,9 @@ static u8 ali_udma_filter(ide_drive_t *drive)
 	if (m5229_revision > 0x20 && m5229_revision < 0xC2) {
 		if (drive->media != ide_disk)
 			return 0;
-#ifndef CONFIG_WDC_ALI15X3
 		if (chip_is_1543c_e && strstr(drive->id->model, "WDC ") &&
 		    wdc_udma == 0)
 			return 0;
-#endif
 	}
 
 	return drive->hwif->ultra_mask;