Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8

Authored by Dave Airlie
1 parent 71beefe8c0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

include/linux/io-mapping.h
Diff comments   View file @ 31ce4bf
... ... @@ -22,7 +22,6 @@
22 22 #include <linux/slab.h>
23 23 #include <asm/io.h>
24 24 #include <asm/page.h>
25   -#include <asm/iomap.h>
26 25  
27 26 /*
28 27 * The io_mapping mechanism provides an abstraction for mapping
... ... @@ -32,6 +31,8 @@
32 31 */
33 32  
34 33 #ifdef CONFIG_HAVE_ATOMIC_IOMAP
  34 +
  35 +#include <asm/iomap.h>
35 36  
36 37 struct io_mapping {
37 38 resource_size_t base;