diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 10:22:21 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 10:22:21 +0200 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /arch/arm/mach-aaec2000/core.h | |
| parent | Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h (diff) | |
| parent | [BRIDGE]: need to ref count the LLC sap (diff) | |
| download | linux-66643de455c27973ac31ad6de9f859d399916842.tar.xz linux-66643de455c27973ac31ad6de9f859d399916842.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/arm/mach-aaec2000/core.h')
| -rw-r--r-- | arch/arm/mach-aaec2000/core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-aaec2000/core.h b/arch/arm/mach-aaec2000/core.h index b6029a95f19c..59501b573167 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; |