From 233d7e3940e73abde2471f45573efb0d9039090b Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Sun, 24 Dec 2006 01:36:35 +0100
Subject: [PATCH] --- yaml --- r: 45332 b: refs/heads/master c:
 9ca3f07b869c1fbbdfdac3150019a3e4d2948d8e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/kernel/time.c  | 2 ++
 trunk/arch/arm/kernel/traps.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 490235efa44f..016c4423d08b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2bdb176ffae3fd2c162db897a05fbad044ff9e9
+refs/heads/master: 9ca3f07b869c1fbbdfdac3150019a3e4d2948d8e
diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c
index 6ff5e3ff6cb5..174cd4900bf9 100644
--- a/trunk/arch/arm/kernel/time.c
+++ b/trunk/arch/arm/kernel/time.c
@@ -29,6 +29,8 @@
 #include <linux/timer.h>
 #include <linux/irq.h>
 
+#include <linux/mc146818rtc.h>
+
 #include <asm/leds.h>
 #include <asm/thread_info.h>
 #include <asm/mach/time.h>
diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c
index 042a12982e98..908915675edc 100644
--- a/trunk/arch/arm/kernel/traps.c
+++ b/trunk/arch/arm/kernel/traps.c
@@ -27,6 +27,7 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/traps.h>
+#include <asm/io.h>
 
 #include "ptrace.h"
 #include "signal.h"