From ebd8ab52fa45cb7ba140dd7252d0516f1c4272fc Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Thu, 23 Feb 2012 14:27:58 +0100
Subject: [PATCH] --- yaml --- r: 296383 b: refs/heads/master c:
 905cdc88b6eb9074c203be4883bce6c170757338 h: refs/heads/master i:   296381:
 eb36f655b68f9c29b98e2ec5f56efc34e0dc2183   296379:
 99d66285190bc57e13f5742affc505b9d63e25b5   296375:
 741a54c71f5ad82bd8c1c654205f9db8c4de671f   296367:
 a36cd471534b3ef5f667323063857a391ee772b1   296351:
 1df901ff3fc26be51a7a9b25f4f50be2d397eeb4   296319:
 b09588aceac5e751d4293da22cb257265f917f3b v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/rtc/rtc-sa1100.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae1850862e70..911885be5162 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7256ecc2b7b91b4212ccc5511cb12254bdf806d0
+refs/heads/master: 905cdc88b6eb9074c203be4883bce6c170757338
diff --git a/trunk/drivers/rtc/rtc-sa1100.c b/trunk/drivers/rtc/rtc-sa1100.c
index cb9a585312cc..e8f1adde4d82 100644
--- a/trunk/drivers/rtc/rtc-sa1100.c
+++ b/trunk/drivers/rtc/rtc-sa1100.c
@@ -32,7 +32,7 @@
 #include <linux/bitops.h>
 
 #include <mach/hardware.h>
-#include <asm/irq.h>
+#include <mach/irqs.h>
 
 #ifdef CONFIG_ARCH_PXA
 #include <mach/regs-rtc.h>