git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.27-rc8' into x86/setup
[pandora-kernel.git]
/
arch
/
arm
/
mach-lh7a40x
/
clcd.c
diff --git
a/arch/arm/mach-lh7a40x/clcd.c
b/arch/arm/mach-lh7a40x/clcd.c
index
93751fe
..
a2a5432
100644
(file)
--- a/
arch/arm/mach-lh7a40x/clcd.c
+++ b/
arch/arm/mach-lh7a40x/clcd.c
@@
-8,7
+8,7
@@
* version 2 as published by the Free Software Foundation.
*
*/
* version 2 as published by the Free Software Foundation.
*
*/
-#include <linux/config.h>
+
#include <linux/init.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
@@
-17,14
+17,13
@@
//#include <linux/module.h>
//#include <linux/time.h>
//#include <linux/module.h>
//#include <linux/time.h>
-//#include <asm/hardware.h>
//#include <asm/mach/time.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/system.h>
//#include <asm/mach/time.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/system.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>