diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-13 11:47:52 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-13 11:47:52 -0400 |
commit | 76bb7782c6831bf450b964eb7596e21bcd23fc32 (patch) | |
tree | cc6fbeaa9ef9f06c946e9f2875decf2df2556f79 | |
parent | b140b99c413ce410197cfcd4014e757cd745226a (diff) |
ide: remove CONFIG_IDEDMA_IVB config option
Devices which don't set word 93 validation bit should be now handled by
ide-iops.c::ivb_list[] and for debugging purposes cable detection can be
completely overriden with "idex=ata66" parameter.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/Kconfig | 16 | ||||
-rw-r--r-- | drivers/ide/ide-iops.c | 4 |
2 files changed, 0 insertions, 20 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index aa0e0c9f74c5..8982c0932438 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -1074,22 +1074,6 @@ endif | |||
1074 | config BLK_DEV_IDEDMA | 1074 | config BLK_DEV_IDEDMA |
1075 | def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 1075 | def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
1076 | 1076 | ||
1077 | config IDEDMA_IVB | ||
1078 | bool "IGNORE word93 Validation BITS" | ||
1079 | depends on BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS | ||
1080 | ---help--- | ||
1081 | There are unclear terms in ATA-4 and ATA-5 standards how certain | ||
1082 | hardware (an 80c ribbon) should be detected. Different interpretations | ||
1083 | of the standards have been released in hardware. This causes problems: | ||
1084 | for example, a host with Ultra Mode 4 (or higher) will not run | ||
1085 | in that mode with an 80c ribbon. | ||
1086 | |||
1087 | If you are experiencing compatibility or performance problems, you | ||
1088 | MAY try to answer Y here. However, it does not necessarily solve | ||
1089 | any of your problems, it could even cause more of them. | ||
1090 | |||
1091 | It is normally safe to answer Y; however, the default is N. | ||
1092 | |||
1093 | endif | 1077 | endif |
1094 | 1078 | ||
1095 | config BLK_DEV_HD_ONLY | 1079 | config BLK_DEV_HD_ONLY |
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index bb691f2eb5bf..aa738833bed5 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -616,11 +616,7 @@ u8 eighty_ninty_three (ide_drive_t *drive) | |||
616 | * - force bit13 (80c cable present) check also for !ivb devices | 616 | * - force bit13 (80c cable present) check also for !ivb devices |
617 | * (unless the slave device is pre-ATA3) | 617 | * (unless the slave device is pre-ATA3) |
618 | */ | 618 | */ |
619 | #ifndef CONFIG_IDEDMA_IVB | ||
620 | if ((id->hw_config & 0x4000) || (ivb && (id->hw_config & 0x2000))) | 619 | if ((id->hw_config & 0x4000) || (ivb && (id->hw_config & 0x2000))) |
621 | #else | ||
622 | if (id->hw_config & 0x6000) | ||
623 | #endif | ||
624 | return 1; | 620 | return 1; |
625 | 621 | ||
626 | no_80w: | 622 | no_80w: |