aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:08 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:08 -0500
commit4ee06b7e677da4c75f2fcc5fd850543852d18bf2 (patch)
tree0c7c4b1e2be3179cc25e95f4148577cd9047e398 /drivers/ide/ide-probe.c
parentf1ca6d37f991347b87d86430db42e2ab139d1b1d (diff)
ide: remove stale ide.h "configuration options"
Remove stale ide.h "configuration options": * INITIAL_MULT_COUNT - always defined to 0 * SUPPORT_SLOW_DATA_PORTS - unused * OK_TO_RESET_CONTROLLER - always defined to 1 * DISABLE_IRQ_NOSYNC - always defined to 0 Leave SUPPORT_VLB_SYNC (defined to 0 for CRIS and FRV, otherwise to 1) for now but disallow overriding it by <asm/ide.h>. There should be no functionality changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 0dda7ac0d951..8e5d8dd315af 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -95,10 +95,10 @@ static void ide_disk_init_mult_count(ide_drive_t *drive)
95#ifdef CONFIG_IDEDISK_MULTI_MODE 95#ifdef CONFIG_IDEDISK_MULTI_MODE
96 id->multsect = ((id->max_multsect/2) > 1) ? id->max_multsect : 0; 96 id->multsect = ((id->max_multsect/2) > 1) ? id->max_multsect : 0;
97 id->multsect_valid = id->multsect ? 1 : 0; 97 id->multsect_valid = id->multsect ? 1 : 0;
98 drive->mult_req = id->multsect_valid ? id->max_multsect : INITIAL_MULT_COUNT; 98 drive->mult_req = id->multsect_valid ? id->max_multsect : 0;
99 drive->special.b.set_multmode = drive->mult_req ? 1 : 0; 99 drive->special.b.set_multmode = drive->mult_req ? 1 : 0;
100#else /* original, pre IDE-NFG, per request of AC */ 100#else /* original, pre IDE-NFG, per request of AC */
101 drive->mult_req = INITIAL_MULT_COUNT; 101 drive->mult_req = 0;
102 if (drive->mult_req > id->max_multsect) 102 if (drive->mult_req > id->max_multsect)
103 drive->mult_req = id->max_multsect; 103 drive->mult_req = id->max_multsect;
104 if (drive->mult_req || ((id->multsect_valid & 1) && id->multsect)) 104 if (drive->mult_req || ((id->multsect_valid & 1) && id->multsect))