hw/block/nand.c: Include osdep.h first

Include osdep.h as the first header in nand.c; this has to be
done manually because coccinelle gets confused by the way that
this C file includes itself.

We fix some odd spacing in #includes while we are in the area.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>

diff --git a/hw/block/nand.c b/hw/block/nand.c
index 478e1a6..f51e13f 100644 (file)
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -18,8 +18,9 @@
 
 #ifndef NAND_IO
 
-# include "hw/hw.h"
-# include "hw/block/flash.h"
+#include "qemu/osdep.h"
+#include "hw/hw.h"
+#include "hw/block/flash.h"
 #include "sysemu/block-backend.h"
 #include "hw/qdev.h"
 #include "qemu/error-report.h"