Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / scripts / dtc / data.c

diff --git a/scripts/dtc/data.c b/scripts/dtc/data.c
index 8cae23746882e4747ea5d13e300484452fc48eee..aa37a16c889186aff62274ec708e89dea7dbd971 100644 (file)
--- a/scripts/dtc/data.c
+++ b/scripts/dtc/data.c
@@ -171,9 +171,9 @@ struct data data_merge(struct data d1, struct data d2)
 struct data data_append_integer(struct data d, uint64_t value, int bits)
 {
        uint8_t value_8;
-       uint16_t value_16;
-       uint32_t value_32;
-       uint64_t value_64;
+       fdt16_t value_16;
+       fdt32_t value_32;
+       fdt64_t value_64;
 
        switch (bits) {
        case 8:
@@ -197,14 +197,14 @@ struct data data_append_integer(struct data d, uint64_t value, int bits)
        }
 }
 
-struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
+struct data data_append_re(struct data d, uint64_t address, uint64_t size)
 {
-       struct fdt_reserve_entry bere;
+       struct fdt_reserve_entry re;
 
-       bere.address = cpu_to_fdt64(re->address);
-       bere.size = cpu_to_fdt64(re->size);
+       re.address = cpu_to_fdt64(address);
+       re.size = cpu_to_fdt64(size);
 
-       return data_append_data(d, &bere, sizeof(bere));
+       return data_append_data(d, &re, sizeof(re));
 }
 
 struct data data_append_cell(struct data d, cell_t word)