Skip to content

Commit

Permalink
MIPS: SNI: Fix conflicting wrapper symbols for headers.
Browse files Browse the repository at this point in the history
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: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
ralfbaechle committed Oct 20, 2011
1 parent cba2efb commit dd5d138
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions arch/mips/include/asm/mipsprom.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __ASM_MIPS_PROM_H
#define __ASM_MIPS_PROM_H
#ifndef __ASM_MIPSPROM_H
#define __ASM_MIPSPROM_H

#define PROM_RESET 0
#define PROM_EXEC 1
Expand Down Expand Up @@ -73,4 +73,4 @@

extern char *prom_getenv(char *);

#endif /* __ASM_MIPS_PROM_H */
#endif /* __ASM_MIPSPROM_H */
6 changes: 3 additions & 3 deletions arch/mips/include/asm/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* published by the Free Software Foundation.
*
*/
#ifndef __ASM_MIPS_PROM_H
#define __ASM_MIPS_PROM_H
#ifndef __ASM_PROM_H
#define __ASM_PROM_H

#ifdef CONFIG_OF
#include <asm/bootinfo.h>
Expand All @@ -25,4 +25,4 @@ extern void device_tree_init(void);
static inline void device_tree_init(void) { }
#endif /* CONFIG_OF */

#endif /* _ASM_MIPS_PROM_H */
#endif /* __ASM_PROM_H */

0 comments on commit dd5d138

Please sign in to comment.