tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Ralf Baechle <ralf@linux-mips.org>
+6
-6
+3
-3
arch/mips/include/asm/mipsprom.h
+3
-3
arch/mips/include/asm/mipsprom.h
···
1
-
#ifndef __ASM_MIPS_PROM_H
2
-
#define __ASM_MIPS_PROM_H
1
+
#ifndef __ASM_MIPSPROM_H
2
+
#define __ASM_MIPSPROM_H
3
3
4
4
#define PROM_RESET 0
5
5
#define PROM_EXEC 1
···
73
73
74
74
extern char *prom_getenv(char *);
75
75
76
-
#endif /* __ASM_MIPS_PROM_H */
76
+
#endif /* __ASM_MIPSPROM_H */
+3
-3
arch/mips/include/asm/prom.h
+3
-3
arch/mips/include/asm/prom.h
···
8
8
* published by the Free Software Foundation.
9
9
*
10
10
*/
11
-
#ifndef __ASM_MIPS_PROM_H
12
-
#define __ASM_MIPS_PROM_H
11
+
#ifndef __ASM_PROM_H
12
+
#define __ASM_PROM_H
13
13
14
14
#ifdef CONFIG_OF
15
15
#include <asm/bootinfo.h>
···
25
25
static inline void device_tree_init(void) { }
26
26
#endif /* CONFIG_OF */
27
27
28
-
#endif /* _ASM_MIPS_PROM_H */
28
+
#endif /* __ASM_PROM_H */