Commit dd5d1380 authored by Ralf Baechle's avatar Ralf Baechle

MIPS: SNI: Fix conflicting wrapper symbols for headers.

If Open Firmware / Device Tree support is enabled on a SNI RM kernel both
<asm/mipsprom.h> and <asm/prom.h> will be included into some .c files.
Since both headers use the same wrapper symbol only the inclusion of the
first file will have an effect but the 2nd file will be ignored resulting
in a build error.
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent cba2efb6
#ifndef __ASM_MIPS_PROM_H #ifndef __ASM_MIPSPROM_H
#define __ASM_MIPS_PROM_H #define __ASM_MIPSPROM_H
#define PROM_RESET 0 #define PROM_RESET 0
#define PROM_EXEC 1 #define PROM_EXEC 1
...@@ -73,4 +73,4 @@ ...@@ -73,4 +73,4 @@
extern char *prom_getenv(char *); extern char *prom_getenv(char *);
#endif /* __ASM_MIPS_PROM_H */ #endif /* __ASM_MIPSPROM_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
* *
*/ */
#ifndef __ASM_MIPS_PROM_H #ifndef __ASM_PROM_H
#define __ASM_MIPS_PROM_H #define __ASM_PROM_H
#ifdef CONFIG_OF #ifdef CONFIG_OF
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
...@@ -25,4 +25,4 @@ extern void device_tree_init(void); ...@@ -25,4 +25,4 @@ extern void device_tree_init(void);
static inline void device_tree_init(void) { } static inline void device_tree_init(void) { }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
#endif /* _ASM_MIPS_PROM_H */ #endif /* __ASM_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