Commit 31ce4bfd authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>
parent 71beefe8

include/linux/io-mapping.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <asm/io.h>

#include <asm/io.h>

#include <asm/page.h>

#include <asm/page.h>

#include <asm/iomap.h>





/*

/*

 * The io_mapping mechanism provides an abstraction for mapping

 * The io_mapping mechanism provides an abstraction for mapping
@@ -33,6 +32,8 @@ 




#ifdef CONFIG_HAVE_ATOMIC_IOMAP

#ifdef CONFIG_HAVE_ATOMIC_IOMAP





#include <asm/iomap.h>



struct io_mapping {

struct io_mapping {

	resource_size_t base;

	resource_size_t base;

	unsigned long size;

	unsigned long size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE