summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-w90x900/time.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-20 09:23:28 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-20 09:23:28 +0100
commit0ce1c383681370964e7f77dd44506aeb3a6ba657 (patch)
tree75aa590c636feed7d110c03eddb56cc518fc034c /arch/arm/mach-w90x900/time.c
parent0a2a18b721abc960fbcada406746877d22340a60 (diff)
parent1de9e8e70f5acc441550ca75433563d91b269bbe (diff)
downloadop-kernel-dev-0ce1c383681370964e7f77dd44506aeb3a6ba657.zip
op-kernel-dev-0ce1c383681370964e7f77dd44506aeb3a6ba657.tar.gz
Merge commit 'v2.6.29-rc2' into x86/mm
Diffstat (limited to 'arch/arm/mach-w90x900/time.c')
-rw-r--r--arch/arm/mach-w90x900/time.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c
index 3a69e38..bcc838f 100644
--- a/arch/arm/mach-w90x900/time.c
+++ b/arch/arm/mach-w90x900/time.c
@@ -28,7 +28,6 @@
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
-#include <mach/system.h>
#include <mach/map.h>
#include <mach/regs-timer.h>
OpenPOWER on IntegriCloud