diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2007-12-30 06:45:40 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-01-11 12:05:41 -0500 |
| commit | 320167182dc3e351d2608cb7dccde12a47e3f51d (patch) | |
| tree | 6583a349f5e713f0f96a2be14e9a3c544467d0b7 | |
| parent | 88fb61e4ba263685a0d5b82c7e9cd6f22a9e6a9d (diff) | |
[MIPS] Wrong CONFIG option prevents setup of DMA zone.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/mm/dma-default.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index ae76795685cc..810535dd091b 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c | |||
| @@ -45,7 +45,7 @@ static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp) | |||
| 45 | /* ignore region specifiers */ | 45 | /* ignore region specifiers */ |
| 46 | gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM); | 46 | gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM); |
| 47 | 47 | ||
| 48 | #ifdef CONFIG_ZONE_DMA32 | 48 | #ifdef CONFIG_ZONE_DMA |
| 49 | if (dev == NULL) | 49 | if (dev == NULL) |
| 50 | gfp |= __GFP_DMA; | 50 | gfp |= __GFP_DMA; |
| 51 | else if (dev->coherent_dma_mask < DMA_BIT_MASK(24)) | 51 | else if (dev->coherent_dma_mask < DMA_BIT_MASK(24)) |