From: Juan Quintela <quintela@redhat.com>
Date: Thu, 18 May 2017 10:36:42 +0000 (+0200)
Subject: trivial: Remove unneeded ifndef in memory.h
X-Git-Tag: v2.11.1~500^2~13
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e8758b62290c45b5b2f3c7925e250b9f16293f27;p=mirror_qemu.git

trivial: Remove unneeded ifndef in memory.h

All the file is surounded already by #ifndef CONFIG_USER_ONLY.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/include/exec/memory.h b/include/exec/memory.h
index bfdc685f24..80e605a96a 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -17,9 +17,7 @@
 #ifndef CONFIG_USER_ONLY
 
 #include "exec/cpu-common.h"
-#ifndef CONFIG_USER_ONLY
 #include "exec/hwaddr.h"
-#endif
 #include "exec/memattrs.h"
 #include "exec/ramlist.h"
 #include "qemu/queue.h"