summaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-05-15 01:06:16 +0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-05-15 01:06:16 +0400
commite7f379d5cabb2790ecce5d623382fa6085e7686d (patch)
treec38b2d36fd35f27db369e1091b39e7d47e37db3b /drivers/ide
parent63b1623ef0e33160d782fd1b0044e9a8af5d16cf (diff)
downloadlinux-e7f379d5cabb2790ecce5d623382fa6085e7686d.tar.xz
alim15x3: remove WDC_ALI15X3 config option
There is "wdc_udma" module parameter now. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/Kconfig15
-rw-r--r--drivers/ide/pci/alim15x3.c4
2 files changed, 0 insertions, 19 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index f702f9152ce6..627f08e93e0a 100644
--- a/drivers/ide/Kconfig
+++ b/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/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 3eaab542c41a..f2129d5e07f2 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/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;