aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/cris/ide-cris.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 325e608d9e62..b0cd0326cf57 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -673,9 +673,12 @@ static void cris_ide_input_data (ide_drive_t *drive, void *, unsigned int);
673static void cris_ide_output_data (ide_drive_t *drive, void *, unsigned int); 673static void cris_ide_output_data (ide_drive_t *drive, void *, unsigned int);
674static void cris_atapi_input_bytes(ide_drive_t *drive, void *, unsigned int); 674static void cris_atapi_input_bytes(ide_drive_t *drive, void *, unsigned int);
675static void cris_atapi_output_bytes(ide_drive_t *drive, void *, unsigned int); 675static void cris_atapi_output_bytes(ide_drive_t *drive, void *, unsigned int);
676static int cris_dma_on (ide_drive_t *drive);
677 676
678static void cris_dma_off(ide_drive_t *drive) 677static void cris_dma_host_off(ide_drive_t *drive)
678{
679}
680
681static void cris_dma_host_on(ide_drive_t *drive)
679{ 682{
680} 683}
681 684
@@ -799,9 +802,8 @@ init_e100_ide (void)
799 hwif->OUTBSYNC = &cris_ide_outbsync; 802 hwif->OUTBSYNC = &cris_ide_outbsync;
800 hwif->INB = &cris_ide_inb; 803 hwif->INB = &cris_ide_inb;
801 hwif->INW = &cris_ide_inw; 804 hwif->INW = &cris_ide_inw;
802 hwif->dma_host_off = &cris_dma_off; 805 hwif->dma_host_off = &cris_dma_host_off;
803 hwif->dma_host_on = &cris_dma_on; 806 hwif->dma_host_on = &cris_dma_host_on;
804 hwif->dma_off_quietly = &cris_dma_off;
805 hwif->cbl = ATA_CBL_PATA40; 807 hwif->cbl = ATA_CBL_PATA40;
806 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA; 808 hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
807 hwif->pio_mask = ATA_PIO4, 809 hwif->pio_mask = ATA_PIO4,
@@ -823,12 +825,6 @@ init_e100_ide (void)
823 cris_ide_set_speed(TYPE_UDMA, ATA_UDMA2_CYC, ATA_UDMA2_DVS, 0); 825 cris_ide_set_speed(TYPE_UDMA, ATA_UDMA2_CYC, ATA_UDMA2_DVS, 0);
824} 826}
825 827
826static int cris_dma_on (ide_drive_t *drive)
827{
828 return 0;
829}
830
831
832static cris_dma_descr_type mydescr __attribute__ ((__aligned__(16))); 828static cris_dma_descr_type mydescr __attribute__ ((__aligned__(16)));
833 829
834/* 830/*