lkml.org 
[lkml]   [2004]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: Linux 2.6.3-rc2
    On Tue, 10 Feb 2004, Bartlomiej Zolnierkiewicz wrote:
    > > It fails with `unterminated `#if' conditional'.
    >
    > Please pass me brown paper bag...
    >
    > [PATCH] fix build for CONFIG_BLK_DEV_IDEDMA=n
    >
    > "fix duplication of DMA {black,white}list in icside.c" patch broke it.
    >
    > Noticed by Geert Uytterhoeven <geert@linux-m68k.org>.
    >
    > linux-2.6.3-rc2-root/include/linux/ide.h | 6 +++---
    > 1 files changed, 3 insertions(+), 3 deletions(-)
    >
    > diff -puN include/linux/ide.h~ide_release_dma_fix include/linux/ide.h
    > --- linux-2.6.3-rc2/include/linux/ide.h~ide_release_dma_fix 2004-02-10 16:30:48.085986376 +0100
    > +++ linux-2.6.3-rc2-root/include/linux/ide.h 2004-02-10 16:35:38.959766840 +0100
    > @@ -1626,6 +1626,7 @@ extern int __ide_dma_count(ide_drive_t *
    > extern int __ide_dma_verbose(ide_drive_t *);
    > extern int __ide_dma_lostirq(ide_drive_t *);
    > extern int __ide_dma_timeout(ide_drive_t *);
    > +#endif /* CONFIG_BLK_DEV_IDEDMA_PCI */
    >
    > #ifdef CONFIG_BLK_DEV_IDE_TCQ
    > extern int __ide_dma_queued_on(ide_drive_t *drive);
    > @@ -1634,13 +1635,12 @@ extern ide_startstop_t __ide_dma_queued_
    > extern ide_startstop_t __ide_dma_queued_write(ide_drive_t *drive);
    > extern ide_startstop_t __ide_dma_queued_start(ide_drive_t *drive);
    > #endif
    > +#endif /* CONFIG_BLK_DEV_IDEDMA */
    >
    > -#else
    > +#ifndef CONFIG_BLK_DEV_IDEDMA_PCI
    > static inline void ide_release_dma(ide_hwif_t *drive) {;}
    > #endif
    >
    > -#endif /* CONFIG_BLK_DEV_IDEDMA */
    > -
    > extern int ide_hwif_request_regions(ide_hwif_t *hwif);
    > extern void ide_hwif_release_regions(ide_hwif_t* hwif);
    > extern void ide_unregister (unsigned int index);

    This one seems to work fine. Thanks!

    Gr{oetje,eeting}s,

    Geert

    --
    Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

    In personal conversations with technical people, I call myself a hacker. But
    when I'm talking to journalists I just say "programmer" or something like that.
    -- Linus Torvalds
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:00    [W:0.021 / U:1.384 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site