From: Dave Airlie <airlied@redhat.com>
Date: Thu, 12 Aug 2010 01:47:50 +0000 (+1000)
Subject: io-mapping: move asm include inside the config option
X-Git-Tag: v3.12-rc1~8827^2~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8;p=kernel%2Fkernel-generic.git

io-mapping: move asm include inside the config option

nouveau starting using these APIs, the first on non-x86 hw, and this
include isn't required on anything with real amounts of vmalloc space.

this fixes a build problem on powerpc.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
index e0ea40f..0a6b3d5 100644
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/page.h>
-#include <asm/iomap.h>
 
 /*
  * The io_mapping mechanism provides an abstraction for mapping
@@ -33,6 +32,8 @@
 
 #ifdef CONFIG_HAVE_ATOMIC_IOMAP
 
+#include <asm/iomap.h>
+
 struct io_mapping {
 	resource_size_t base;
 	unsigned long size;