From: Juan Quintela <quintela@redhat.com>
Date: Mon, 27 Jul 2009 14:12:53 +0000 (+0200)
Subject: Refactor code to remove one #ifdef CONFIG_FDT
X-Git-Tag: v0.12.0-rc0~1804
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84f1581861b880f28a927bbcefa564f54ea8d255;p=thirdparty%2Fqemu.git

Refactor code to remove one #ifdef CONFIG_FDT

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 68a1a6af834..a04794d7f34 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -52,14 +52,12 @@ static int petalogix_load_device_tree(target_phys_addr_t addr,
                                       target_phys_addr_t initrd_size,
                                       const char *kernel_cmdline)
 {
+    char *path;
+    int fdt_size;
 #ifdef CONFIG_FDT
     void *fdt;
     int r;
-#endif
-    char *path;
-    int fdt_size;
 
-#ifdef CONFIG_FDT
     /* Try the local "mb.dtb" override.  */
     fdt = load_device_tree("mb.dtb", &fdt_size);
     if (!fdt) {