summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/time.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
commit0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch)
tree5085c389f09da78182b899d19fe1068b619a69dd /arch/arm/kernel/time.c
parent273767781288c35c9d679e908672b9996cda4c34 (diff)
Merge with 2.3.10.
Diffstat (limited to 'arch/arm/kernel/time.c')
-rw-r--r--arch/arm/kernel/time.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index c874a1ba8..4e49885b8 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -23,8 +23,6 @@
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/delay.h>
#include <asm/uaccess.h>
#include <asm/io.h>