diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-05-05 16:39:47 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-05-05 16:39:47 +0300 |
| commit | 5300f1a5487f67f0bde8ee1081b799108668cb1d (patch) | |
| tree | 5274ff496f2665487736a4eec23bf76601e4da44 /device_tree.c | |
| parent | 8d4c78e7c8adf0a4440a8de92738b3820fc8215a (diff) | |
| parent | d2d979c628e4b2c4a3cb71a31841875795c79043 (diff) | |
Merge remote branch 'origin/master' into pci
Conflicts:
exec.c
Diffstat (limited to 'device_tree.c')
| -rw-r--r-- | device_tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/device_tree.c b/device_tree.c index 426a63155c..f5d5eb1bca 100644 --- a/device_tree.c +++ b/device_tree.c @@ -20,7 +20,6 @@ #include "config.h" #include "qemu-common.h" -#include "sysemu.h" #include "device_tree.h" #include "hw/loader.h" @@ -74,7 +73,7 @@ fail: } int qemu_devtree_setprop(void *fdt, const char *node_path, - const char *property, uint32_t *val_array, int size) + const char *property, void *val_array, int size) { int offset; |