Commit 3f8b76a6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Ungerer

binfmt_flat: consolidate two version of flat_v2_reloc_t

Two branches of the ifdef maze actually have the same content, so merge
them.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent 38e63483
......@@ -69,15 +69,13 @@ struct flat_hdr {
typedef union {
unsigned long value;
struct {
# if defined(mc68000) && !defined(CONFIG_COLDFIRE)
#if defined(__LITTLE_ENDIAN_BITFIELD) || \
(defined(mc68000) && !defined(CONFIG_COLDFIRE))
signed long offset : 30;
unsigned long type : 2;
# elif defined(__BIG_ENDIAN_BITFIELD)
unsigned long type : 2;
signed long offset : 30;
# elif defined(__LITTLE_ENDIAN_BITFIELD)
signed long offset : 30;
unsigned long type : 2;
# else
# error "Unknown bitfield order for flat files."
# endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment