From: Thomas Bogendoerfer Date: Sun, 30 Dec 2007 11:45:40 +0000 (+0100) Subject: [MIPS] Wrong CONFIG option prevents setup of DMA zone. X-Git-Tag: v2.6.24-rc8~43^2~4 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=320167182dc3e351d2608cb7dccde12a47e3f51d;p=linux-2.6 [MIPS] Wrong CONFIG option prevents setup of DMA zone. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index ae76795685..810535dd09 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) /* ignore region specifiers */ gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM); -#ifdef CONFIG_ZONE_DMA32 +#ifdef CONFIG_ZONE_DMA if (dev == NULL) gfp |= __GFP_DMA; else if (dev->coherent_dma_mask < DMA_BIT_MASK(24))