Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71fc9fcc authored by Kevin Hilman's avatar Kevin Hilman Committed by Bartlomiej Zolnierkiewicz
Browse files

IDE: compile fix for sff_dma_ops 



The sff_dma_ops struct should be wrapped by BLK_DEV_IDEDMA_SFF instead
of BLK_DEV_IDEDMA_PCI.

Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent bef69ea0

include/linux/ide.h

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,6 @@ void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *); 
#ifdef CONFIG_BLK_DEV_IDEDMA_PCI

int ide_pci_set_master(struct pci_dev *, const char *);

unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *);

extern const struct ide_dma_ops sff_dma_ops;

int ide_pci_check_simplex(ide_hwif_t *, const struct ide_port_info *);

int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *);

#else
@@ -1275,6 +1274,7 @@ extern int __ide_dma_end(ide_drive_t *); 
int ide_dma_test_irq(ide_drive_t *);

extern void ide_dma_lost_irq(ide_drive_t *);

extern void ide_dma_timeout(ide_drive_t *);

extern const struct ide_dma_ops sff_dma_ops;

#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */



#else