projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release
[linux-2.6-block.git]
/
arch
/
arm
/
mach-aaec2000
/
core.h
diff --git
a/arch/arm/mach-aaec2000/core.h
b/arch/arm/mach-aaec2000/core.h
index daefc0ea14a10236c8aca9e068dda22f6cd24540..59501b5731674b5a99c5119916b335fec7300c85 100644
(file)
--- a/
arch/arm/mach-aaec2000/core.h
+++ b/
arch/arm/mach-aaec2000/core.h
@@
-9,7
+9,8
@@
*
*/
-#include <asm/hardware/amba_clcd.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/clcd.h>
struct sys_timer;