From a2f716d1ff3136ed6968f545346db54c0b9fe8df Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Tue, 29 May 2012 08:14:14 +0000
Subject: [PATCH] --- yaml --- r: 309544 b: refs/heads/master c:
 e49e6ff553ffee2e747a8e331a9dcf3a80555944 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sparc/include/asm/leon.h   | 1 +
 trunk/arch/sparc/kernel/prom_common.c | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 88f6d62858a1..bae3b842f654 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fd8bc671887fa02bc19722f6c3707bd7b8a2604
+refs/heads/master: e49e6ff553ffee2e747a8e331a9dcf3a80555944
diff --git a/trunk/arch/sparc/include/asm/leon.h b/trunk/arch/sparc/include/asm/leon.h
index ba46083ee42e..3375c6293893 100644
--- a/trunk/arch/sparc/include/asm/leon.h
+++ b/trunk/arch/sparc/include/asm/leon.h
@@ -213,6 +213,7 @@ struct leon3_cacheregs {
 	unsigned long dccr;	/* 0x0c - Data Cache Configuration Register */
 };
 
+#include <linux/irq.h>
 #include <linux/interrupt.h>
 
 struct device_node;
diff --git a/trunk/arch/sparc/kernel/prom_common.c b/trunk/arch/sparc/kernel/prom_common.c
index 741df916c124..1303021748c8 100644
--- a/trunk/arch/sparc/kernel/prom_common.c
+++ b/trunk/arch/sparc/kernel/prom_common.c
@@ -23,7 +23,6 @@
 #include <linux/of_pdt.h>
 #include <asm/prom.h>
 #include <asm/oplib.h>
-#include <asm/leon.h>
 
 #include "prom.h"