diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:08 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:08 +0100 |
| commit | 4f52a32994f9e05fb8ae1a9ba3f20cd0b55145b7 (patch) | |
| tree | 32daca85380f3448c0370dd651cca724877938a2 /drivers/ide | |
| parent | rapide: remove write-only hwif->hwif_data (diff) | |
| download | linux-4f52a32994f9e05fb8ae1a9ba3f20cd0b55145b7.tar.xz linux-4f52a32994f9e05fb8ae1a9ba3f20cd0b55145b7.zip | |
ide-pmac: use custom hwif->sg_max_nents only if DMA support is enabled
Move setting hwif->sg_max_nents from pmac_ide_setup_device()
to pmac_ide_setup_dma().
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index cd514743df96..736d12c8e68a 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -1133,8 +1133,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) hwif->noprobe = 0; #endif /* CONFIG_PMAC_MEDIABAY */ - hwif->sg_max_nents = MAX_DCMDS; - #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC /* has a DBDMA controller channel */ if (pmif->dma_regs) @@ -1751,6 +1749,8 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) return; } + hwif->sg_max_nents = MAX_DCMDS; + hwif->dma_host_set = &pmac_ide_dma_host_set; hwif->dma_setup = &pmac_ide_dma_setup; hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd; |