diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /drivers/block/ide-dma.c | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'drivers/block/ide-dma.c')
| -rw-r--r-- | drivers/block/ide-dma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/ide-dma.c b/drivers/block/ide-dma.c index cd631c621..d3c657516 100644 --- a/drivers/block/ide-dma.c +++ b/drivers/block/ide-dma.c @@ -91,7 +91,7 @@ #include <asm/io.h> #include <asm/irq.h> -#ifdef IDEDMA_NEW_DRIVE_LISTINGS +#ifdef CONFIG_IDEDMA_NEW_DRIVE_LISTINGS struct drive_list_entry { char * id_model; @@ -130,7 +130,7 @@ int in_drive_list(struct hd_driveid *id, struct drive_list_entry * drive_table) return 0; } -#else /* !IDEDMA_NEW_DRIVE_LISTINGS */ +#else /* !CONFIG_IDEDMA_NEW_DRIVE_LISTINGS */ /* * good_dma_drives() lists the model names (from "hdparm -i") @@ -162,7 +162,7 @@ const char *bad_dma_drives[] = {"WDC AC11000H", "WDC AC31600H", NULL}; -#endif /* IDEDMA_NEW_DRIVE_LISTINGS */ +#endif /* CONFIG_IDEDMA_NEW_DRIVE_LISTINGS */ /* * Our Physical Region Descriptor (PRD) table should be large enough @@ -314,7 +314,7 @@ int check_drive_lists (ide_drive_t *drive, int good_bad) { struct hd_driveid *id = drive->id; -#ifdef IDEDMA_NEW_DRIVE_LISTINGS +#ifdef CONFIG_IDEDMA_NEW_DRIVE_LISTINGS if (good_bad) { return in_drive_list(id, drive_whitelist); } else { @@ -323,7 +323,7 @@ int check_drive_lists (ide_drive_t *drive, int good_bad) printk("%s: Disabling (U)DMA for %s\n", drive->name, id->model); return(blacklist); } -#else /* !IDEDMA_NEW_DRIVE_LISTINGS */ +#else /* !CONFIG_IDEDMA_NEW_DRIVE_LISTINGS */ const char **list; if (good_bad) { @@ -344,7 +344,7 @@ int check_drive_lists (ide_drive_t *drive, int good_bad) } } } -#endif /* IDEDMA_NEW_DRIVE_LISTINGS */ +#endif /* CONFIG_IDEDMA_NEW_DRIVE_LISTINGS */ return 0; } |