From e49e6ff553ffee2e747a8e331a9dcf3a80555944 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Tue, 29 May 2012 08:14:14 +0000 Subject: [PATCH] sparc: fix sparc64 build due to leon.h inclusion Stephen Rothwell 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: Sam Ravnborg Cc: Stephen Rothwell Signed-off-by: David S. Miller --- arch/sparc/include/asm/leon.h | 1 + arch/sparc/kernel/prom_common.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h index ba46083ee42e..3375c6293893 100644 --- a/arch/sparc/include/asm/leon.h +++ b/arch/sparc/include/asm/leon.h @@ -213,6 +213,7 @@ struct leon3_cacheregs { unsigned long dccr; /* 0x0c - Data Cache Configuration Register */ }; +#include #include struct device_node; diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c index 741df916c124..1303021748c8 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/arch/sparc/kernel/prom_common.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "prom.h" -- 2.30.2