From 71beefe8c0b9e12ed4ac9fe13b98a035ddeaf8eb Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 12 Aug 2010 11:44:50 +1000 Subject: vgaarb: drop vga.h include We don't actually need this include on any platform. built on powerpc + x86, reported on m68k. Reported-by: Geert Uytterhoeven Signed-off-by: Dave Airlie --- include/linux/vgaarb.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/linux') diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 814f294d4cd0..6228b5b77d35 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h @@ -31,7 +31,6 @@ #ifndef LINUX_VGA_H #define LINUX_VGA_H -#include /* Legacy VGA regions */ #define VGA_RSRC_NONE 0x00 -- cgit v1.2.2 From 31ce4bfdfd10bf5db9bf85c92bbe0cf2edbdcad8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 12 Aug 2010 11:47:50 +1000 Subject: 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 --- include/linux/io-mapping.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/linux') 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 #include #include -#include /* * The io_mapping mechanism provides an abstraction for mapping @@ -33,6 +32,8 @@ #ifdef CONFIG_HAVE_ATOMIC_IOMAP +#include + struct io_mapping { resource_size_t base; unsigned long size; -- cgit v1.2.2