From ac6c29bd0a5f869cfa861c6fb77e9cf851d3784b Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Tue, 3 Jan 2012 14:55:24 -0600
Subject: [PATCH] --- yaml --- r: 297613 b: refs/heads/master c:
 bd8abc9a32c9b7b8179e701699141566dd8f7eb8 h: refs/heads/master i:   297611:
 77efd96204c7f566cc9a9127fa00a39be25ac998 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/include/asm/mc146818rtc.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f19684839c2d..f4b763e346cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba3e88acfbb0ba52ea9ae522e5ea74ac3927fc9c
+refs/heads/master: bd8abc9a32c9b7b8179e701699141566dd8f7eb8
diff --git a/trunk/arch/arm/include/asm/mc146818rtc.h b/trunk/arch/arm/include/asm/mc146818rtc.h
index 6b884d2b0b69..e8567bb99dfc 100644
--- a/trunk/arch/arm/include/asm/mc146818rtc.h
+++ b/trunk/arch/arm/include/asm/mc146818rtc.h
@@ -5,7 +5,9 @@
 #define _ASM_MC146818RTC_H
 
 #include <linux/io.h>
-#include <mach/irqs.h>
+#include <linux/kernel.h>
+
+#define RTC_IRQ BUILD_BUG_ON(1)
 
 #ifndef RTC_PORT
 #define RTC_PORT(x)	(0x70 + (x))