summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBellido Nicolas <ml@acolin.be>2006-05-07 22:49:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-05-07 22:49:21 +0100
commit8a33b224ecb576e27695ff8922c8e579dbf7070e (patch)
treeeb346e45f50c24a1c05957fc9987ce2d1a92155c /arch
parent16b6dd4419cdef637a907cfc26594e4ebe688975 (diff)
downloadlinux-3.10-8a33b224ecb576e27695ff8922c8e579dbf7070e.tar.gz
linux-3.10-8a33b224ecb576e27695ff8922c8e579dbf7070e.tar.bz2
linux-3.10-8a33b224ecb576e27695ff8922c8e579dbf7070e.zip
[ARM] 3504/1: Fix clcd includes for aaec2000
Patch from Bellido Nicolas Since this patch: [ARM] 3366/1: Allow the 16bpp mode configuration in the CLCD control register linux/amba/bus.h needs to be included before linux/amba/clcd.h Signed-off-by: Nicolas Bellido <ml@acolin.be> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-aaec2000/core.c1
-rw-r--r--arch/arm/mach-aaec2000/core.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c
index 3be05c43061..65be5efd633 100644
--- a/arch/arm/mach-aaec2000/core.c
+++ b/arch/arm/mach-aaec2000/core.c
@@ -20,7 +20,6 @@
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/signal.h>
-#include <linux/amba/bus.h>
#include <asm/hardware.h>
#include <asm/irq.h>
diff --git a/arch/arm/mach-aaec2000/core.h b/arch/arm/mach-aaec2000/core.h
index b6029a95f19..59501b57316 100644
--- a/arch/arm/mach-aaec2000/core.h
+++ b/arch/arm/mach-aaec2000/core.h
@@ -9,6 +9,7 @@
*
*/
+#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
struct sys_timer;