diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 19:18:33 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 19:18:33 +0000 |
commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
tree | 92f55e374a84d06ce8213a4540454760fdecf137 /arch/arm/mach-realview/localtimer.c | |
parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
download | blackbird-op-linux-0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3.tar.gz blackbird-op-linux-0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3.zip |
Merge Linus' tree.
Diffstat (limited to 'arch/arm/mach-realview/localtimer.c')
-rw-r--r-- | arch/arm/mach-realview/localtimer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c index c9d7c596b200..caf6b8bb6c95 100644 --- a/arch/arm/mach-realview/localtimer.c +++ b/arch/arm/mach-realview/localtimer.c @@ -13,6 +13,7 @@ #include <linux/delay.h> #include <linux/device.h> #include <linux/smp.h> +#include <linux/jiffies.h> #include <asm/mach/time.h> #include <asm/hardware/arm_twd.h> |