diff options
| author | Mark Greer <mgreer@animalcreek.com> | 2018-03-16 14:54:43 -0700 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-04-01 00:47:47 +1100 |
| commit | 147704534e2de30dd47171d55240c394b24f4053 (patch) | |
| tree | 2a9b3f44bbff125a3f67e1218aee3a939e5f422b /arch/powerpc/boot | |
| parent | 8c1c7fb0b5ec95c392e9b585a6cf8cde254308d3 (diff) | |
| download | linux-0-day-147704534e2de30dd47171d55240c394b24f4053.tar.gz linux-0-day-147704534e2de30dd47171d55240c394b24f4053.tar.xz | |
powerpc/boot: Remove duplicate typedefs from libfdt_env.h
When building a uImage or zImage using ppc6xx_defconfig and some other
defconfigs, the following error occurs with GCC 4.5.1:
/arch/powerpc/boot/libfdt_env.h:10:13: error: redefinition of typedef 'uint32_t'
/arch/powerpc/boot/types.h:21:13: note: previous declaration of 'uint32_t' was here
/arch/powerpc/boot/libfdt_env.h:11:13: error: redefinition of typedef 'uint64_t'
/arch/powerpc/boot/types.h:22:13: note: previous declaration of 'uint64_t' was here
The problem is that commit 656ad58ef19e (powerpc/boot: Add OPAL
console to epapr wrappers) adds typedefs for uint32_t and uint64_t to
type.h but doesn't remove the pre-existing (and now duplicate)
typedefs from libfdt_env.h.
Fix the error by removing the duplicate typedefs from libfdt_env.h
Signed-off-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/libfdt_env.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h index f52c31b1f48fa..2a0c8b1bf1479 100644 --- a/arch/powerpc/boot/libfdt_env.h +++ b/arch/powerpc/boot/libfdt_env.h @@ -7,8 +7,6 @@ #include "of.h" -typedef u32 uint32_t; -typedef u64 uint64_t; typedef unsigned long uintptr_t; typedef __be16 fdt16_t; |