diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-12 11:47:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-12 11:47:50 +1000 |
| commit | 31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8 (patch) | |
| tree | 7e6201c46c031894b7c356c4d9d9992fcc04d0f7 /include | |
| parent | 71beefe8c0b9e12ed4ac9fe13b98a035ddeaf8eb (diff) | |
| download | talos-obmc-linux-31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8.tar.gz talos-obmc-linux-31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/io-mapping.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h index e0ea40f6c515..0a6b3d5c490c 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; |
