Commit e49e6ff5 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller

sparc: fix sparc64 build due to leon.h inclusion

Stephen Rothwell <sfr@canb.auug.org.au> reported following error:
In file included from arch/sparc/kernel/prom_common.c:26:0:
arch/sparc/include/asm/leon.h:221:9: error: unknown type name 'irq_flow_handler_t'
arch/sparc/include/asm/leon.h:224:10: error: unknown type name 'irq_flow_handler_t'

Fix this by:
1) Avoid including leon.h in prom_commen.h (not needed)
2) Include irq.h in leon.h to avoid the missing symbol error
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4fd8bc67
...@@ -213,6 +213,7 @@ struct leon3_cacheregs { ...@@ -213,6 +213,7 @@ struct leon3_cacheregs {
unsigned long dccr; /* 0x0c - Data Cache Configuration Register */ unsigned long dccr; /* 0x0c - Data Cache Configuration Register */
}; };
#include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
struct device_node; struct device_node;
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <linux/of_pdt.h> #include <linux/of_pdt.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/oplib.h> #include <asm/oplib.h>
#include <asm/leon.h>
#include "prom.h" #include "prom.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment