---

yaml
---
r: 48813
b: refs/heads/master
c: 8b25c60
h: refs/heads/master
i:
  48811: 46f678a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a523a1759a8b864ea3a7aff9ea4949dcdc4bc3b6
+refs/heads/master: 8b25c60485aab4c7599faef96e7a5d9e8c9003d9

trunk/drivers/ide/pci/trm290.c

@@ -177,7 +177,6 @@ static void trm290_selectproc (ide_drive_t *drive)
 	trm290_prepare_drive(drive, drive->using_dma);
 }
 
-#ifdef CONFIG_BLK_DEV_IDEDMA
 static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
 	ide_hwif_t *hwif	= HWIF(drive);
@@ -242,7 +241,6 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
 	status = hwif->INW(hwif->dma_status);
 	return (status == 0x00ff);
 }
-#endif /* CONFIG_BLK_DEV_IDEDMA */
 
 /*
  * Invoked from ide-dma.c at boot time.
@@ -289,13 +287,11 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 
 	ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3);
 
-#ifdef CONFIG_BLK_DEV_IDEDMA
 	hwif->dma_setup = &trm290_ide_dma_setup;
 	hwif->dma_exec_cmd = &trm290_ide_dma_exec_cmd;
 	hwif->dma_start = &trm290_ide_dma_start;
 	hwif->ide_dma_end = &trm290_ide_dma_end;
 	hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
-#endif /* CONFIG_BLK_DEV_IDEDMA */
 
 	hwif->selectproc = &trm290_selectproc;
 	hwif->autodma = 0;		/* play it safe for now */