diff options
| author | Anthony Liguori | 2013-03-11 01:39:07 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2013-03-11 01:56:35 +0100 |
| commit | 6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c (patch) | |
| tree | 8f275496c83f840e00daf4af97beac94b3a3e0b3 /hw/arm_gic_common.c | |
| parent | Merge remote-tracking branch 'stefanha/trivial-patches' into staging (diff) | |
| parent | sh: move files referencing CPU to hw/sh4/ (diff) | |
| download | qemu-6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c.tar.gz qemu-6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c.tar.xz qemu-6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c.zip | |
Merge remote-tracking branch 'bonzini/hw-dirs' into staging
* bonzini/hw-dirs:
sh: move files referencing CPU to hw/sh4/
ppc: move more files to hw/ppc
ppc: move files referencing CPU to hw/ppc/
m68k: move files referencing CPU to hw/m68k/
i386: move files referencing CPU to hw/i386/
arm: move files referencing CPU to hw/arm/
hw: move boards and other isolated files to hw/ARCH
ppc: express FDT dependency of pSeries and e500 boards via default-configs/
build: always link device_tree.o into emulators if libfdt available
hw: include hw header files with full paths
ppc: do not use ../ in include files
vt82c686: vt82c686 is not a PCI host bridge
virtio-9p: remove PCI dependencies from hw/9pfs/
virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX
hw: move device-hotplug.o to toplevel, compile it once
hw: move qdev-monitor.o to toplevel directory
hw: move fifo.[ch] to libqemuutil
hw: move char backends to backends/
Conflicts:
backends/baum.c
backends/msmouse.c
hw/a15mpcore.c
hw/arm/Makefile.objs
hw/arm/pic_cpu.c
hw/dataplane/event-poll.c
hw/dataplane/virtio-blk.c
include/char/baum.h
include/char/msmouse.h
qemu-char.c
vl.c
Resolve conflicts caused by header movements.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/arm_gic_common.c')
| -rw-r--r-- | hw/arm_gic_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm_gic_common.c b/hw/arm_gic_common.c index 20da9d2b18..f2dc8bf555 100644 --- a/hw/arm_gic_common.c +++ b/hw/arm_gic_common.c @@ -18,7 +18,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "arm_gic_internal.h" +#include "hw/arm_gic_internal.h" static void gic_save(QEMUFile *f, void *opaque) { |