diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-01 18:35:26 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-01 18:35:26 +0100 |
| commit | c7f7ff179cb9f2f1e0244ef2c80afbb93c74ce2a (patch) | |
| tree | 717656ebdba1fea6c763b2c57076c4c6996dfba3 /arch/arm/mach-realview/realview_eb.c | |
| parent | a22f277bba321474a01691ae66d5952926459f44 (diff) | |
| parent | e03cdade0ca945a04e982525e50fef275190b77b (diff) | |
| download | talos-op-linux-c7f7ff179cb9f2f1e0244ef2c80afbb93c74ce2a.tar.gz talos-op-linux-c7f7ff179cb9f2f1e0244ef2c80afbb93c74ce2a.zip | |
Merge branch 'smp' into devel
Diffstat (limited to 'arch/arm/mach-realview/realview_eb.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index c20fbef122b3..8dfa44e08a94 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c @@ -32,6 +32,7 @@ #include <asm/hardware/gic.h> #include <asm/hardware/icst307.h> #include <asm/hardware/cache-l2x0.h> +#include <asm/localtimer.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> |
