MIPS: SNI: Fix conflicting wrapper symbols for headers. (dd5d1380) · Commits · 戴 / test

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>

arch/mips/include/asm/mipsprom.h

+3 −3

Original line number	Diff line number	Diff line
		#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
		@@ -73,4 +73,4 @@

		extern char prom_getenv(char );

		#endif /* __ASM_MIPS_PROM_H */
		#endif /* __ASM_MIPSPROM_H */

arch/mips/include/asm/prom.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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>
		@@ -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 */

Admin message