diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-29 08:14:14 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-29 12:47:38 -0700 |
| commit | e49e6ff553ffee2e747a8e331a9dcf3a80555944 (patch) | |
| tree | 70c7c66a8d093e523ff4e53694ae83ee70939cf0 /arch/sparc | |
| parent | 4fd8bc671887fa02bc19722f6c3707bd7b8a2604 (diff) | |
| download | linux-3.10-e49e6ff553ffee2e747a8e331a9dcf3a80555944.tar.gz linux-3.10-e49e6ff553ffee2e747a8e331a9dcf3a80555944.tar.bz2 linux-3.10-e49e6ff553ffee2e747a8e331a9dcf3a80555944.zip | |
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: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/leon.h | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/prom_common.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h index ba46083ee42..3375c629389 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 <linux/irq.h> #include <linux/interrupt.h> struct device_node; diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c index 741df916c12..1303021748c 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/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" |