Module Name: src Committed By: dholland Date: Wed Nov 17 19:36:54 UTC 2010
Modified Files: src/sys/dev/pci: pciide_common.c Log Message: Fix build when NATA_DMA is 0. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/pciide_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/pciide_common.c diff -u src/sys/dev/pci/pciide_common.c:1.47 src/sys/dev/pci/pciide_common.c:1.48 --- src/sys/dev/pci/pciide_common.c:1.47 Sat Nov 13 13:52:08 2010 +++ src/sys/dev/pci/pciide_common.c Wed Nov 17 19:36:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pciide_common.c,v 1.47 2010/11/13 13:52:08 uebayasi Exp $ */ +/* $NetBSD: pciide_common.c,v 1.48 2010/11/17 19:36:54 dholland Exp $ */ /* @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.47 2010/11/13 13:52:08 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.48 2010/11/17 19:36:54 dholland Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -205,17 +205,21 @@ } for (drive = 0; drive < cp->ata_channel.ch_ndrive; drive++) { +#if NATA_DMA pciide_dma_table_teardown(sc, channel, drive); +#endif } free(cp->ata_channel.ch_queue, M_DEVBUF); cp->ata_channel.atabus = NULL; } +#if NATA_DMA if (sc->sc_dma_ios != 0) bus_space_unmap(sc->sc_dma_iot, sc->sc_dma_ioh, sc->sc_dma_ios); if (sc->sc_ba5_ss != 0) bus_space_unmap(sc->sc_ba5_st, sc->sc_ba5_sh, sc->sc_ba5_ss); +#endif return 0; }