diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:23 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:23 -0500 |
commit | 8b25c60485aab4c7599faef96e7a5d9e8c9003d9 (patch) | |
tree | 9fafa1db041e2c8dfbb4aa548281b44307eb1ab9 /drivers/ide | |
parent | a523a1759a8b864ea3a7aff9ea4949dcdc4bc3b6 (diff) |
trm290: remove redundant CONFIG_BLK_DEV_IDEDMA #ifdef-s
In drivers/ide/Kconfig BLK_DEV_TRM290 depends on
BLK_DEV_IDEDMA_PCI (on which is BLK_DEV_IDEDMA dependant on).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/pci/trm290.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index 174b88c4780e..5eb98893810c 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c | |||
@@ -177,7 +177,6 @@ static void trm290_selectproc (ide_drive_t *drive) | |||
177 | trm290_prepare_drive(drive, drive->using_dma); | 177 | trm290_prepare_drive(drive, drive->using_dma); |
178 | } | 178 | } |
179 | 179 | ||
180 | #ifdef CONFIG_BLK_DEV_IDEDMA | ||
181 | static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command) | 180 | static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command) |
182 | { | 181 | { |
183 | ide_hwif_t *hwif = HWIF(drive); | 182 | ide_hwif_t *hwif = HWIF(drive); |
@@ -242,7 +241,6 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive) | |||
242 | status = hwif->INW(hwif->dma_status); | 241 | status = hwif->INW(hwif->dma_status); |
243 | return (status == 0x00ff); | 242 | return (status == 0x00ff); |
244 | } | 243 | } |
245 | #endif /* CONFIG_BLK_DEV_IDEDMA */ | ||
246 | 244 | ||
247 | /* | 245 | /* |
248 | * Invoked from ide-dma.c at boot time. | 246 | * Invoked from ide-dma.c at boot time. |
@@ -289,13 +287,11 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif) | |||
289 | 287 | ||
290 | ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3); | 288 | ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3); |
291 | 289 | ||
292 | #ifdef CONFIG_BLK_DEV_IDEDMA | ||
293 | hwif->dma_setup = &trm290_ide_dma_setup; | 290 | hwif->dma_setup = &trm290_ide_dma_setup; |
294 | hwif->dma_exec_cmd = &trm290_ide_dma_exec_cmd; | 291 | hwif->dma_exec_cmd = &trm290_ide_dma_exec_cmd; |
295 | hwif->dma_start = &trm290_ide_dma_start; | 292 | hwif->dma_start = &trm290_ide_dma_start; |
296 | hwif->ide_dma_end = &trm290_ide_dma_end; | 293 | hwif->ide_dma_end = &trm290_ide_dma_end; |
297 | hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq; | 294 | hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq; |
298 | #endif /* CONFIG_BLK_DEV_IDEDMA */ | ||
299 | 295 | ||
300 | hwif->selectproc = &trm290_selectproc; | 296 | hwif->selectproc = &trm290_selectproc; |
301 | hwif->autodma = 0; /* play it safe for now */ | 297 | hwif->autodma = 0; /* play it safe for now */ |