| commit | fcd1b105c7ec056424bf1dd0d512a858177881d3 | |
| author | Ralf Baechle <ralf@linux-mips.org> | |
| Mon, 27 Jun 2011 08:45:42 +0000 (27 09:45 +0100) | ||
| committer | Ralf Baechle <ralf@linux-mips.org> | |
| Mon, 27 Jun 2011 08:49:50 +0000 (27 09:49 +0100) | ||
| tree | 3df0bcb637792bc31a9d697d8b163250f50f3130 | treesnapshot (tar.gz zip) |
| parent | 0a22dd3489bf57cb93bd03552c8f48b8ebd02f91 | commitdiff |
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>
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 | diffblobblamehistory | |
| arch/mips/include/asm/prom.h | diffblobblamehistory |