projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[powerpc.git]
/
arch
/
arm
/
mach-aaec2000
/
core.c
diff --git
a/arch/arm/mach-aaec2000/core.c
b/arch/arm/mach-aaec2000/core.c
index
4e706d9
..
dce4815
100644
(file)
--- a/
arch/arm/mach-aaec2000/core.c
+++ b/
arch/arm/mach-aaec2000/core.c
@@
-20,11
+20,11
@@
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/signal.h>
#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>
#include <asm/sizes.h>
#include <asm/hardware.h>
#include <asm/irq.h>
#include <asm/sizes.h>
-#include <asm/hardware/amba.h>
#include <asm/mach/flash.h>
#include <asm/mach/irq.h>
#include <asm/mach/flash.h>
#include <asm/mach/irq.h>