From: David Gibson <david@gibson.dropbear.id.au>
Date: Mon, 7 May 2007 02:13:36 +0000 (+1000)
Subject: [POWERPC] Fix build problem in ppc4xx_sgdma.c
X-Git-Tag: v2.6.22-rc1~358^2~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bd15c4b503b971024a3962b6a6b34c1af0628bf;p=linux-2.6

[POWERPC] Fix build problem in ppc4xx_sgdma.c

ppc4xx_sgdma.c is #including asm/dma-mapping.h directly, which should
only ever be included via linux/dma-mapping.h.  asm/dma-mapping.h
relies on an enum defined in linux/dma-mapping.h before its own
include.  This fixes the problem.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/ppc/syslib/ppc4xx_sgdma.c b/arch/ppc/syslib/ppc4xx_sgdma.c
index 939abe3c1f..93349e48bf 100644
--- a/arch/ppc/syslib/ppc4xx_sgdma.c
+++ b/arch/ppc/syslib/ppc4xx_sgdma.c
@@ -23,11 +23,11 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/dma-mapping.h>
 #include <linux/pci.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/dma-mapping.h>
 #include <asm/ppc4xx_dma.h>
 
 void