diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 17:06:20 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:10 +0200 |
| commit | 0d09e41a51aa0752b1ce525ce084f7cd210e461b (patch) | |
| tree | dc92b5b32c1e3182afa9bfd16a46a0a089320102 /hw/sh4 | |
| parent | bb585a784e9ad69207315d694e7dad2c422f6baa (diff) | |
| download | qemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.tar.gz | |
hw: move headers to include/
Many of these should be cleaned up with proper qdev-/QOM-ification.
Right now there are many catch-all headers in include/hw/ARCH depending
on cpu.h, and this makes it necessary to compile these files per-target.
However, fixing this does not belong in these patches.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/sh4')
| -rw-r--r-- | hw/sh4/r2d.c | 6 | ||||
| -rw-r--r-- | hw/sh4/sh7750.c | 4 | ||||
| -rw-r--r-- | hw/sh4/sh7750_regnames.c | 2 | ||||
| -rw-r--r-- | hw/sh4/shix.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index faa03d2069..bcc326a1e0 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -25,8 +25,8 @@ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/sh.h" -#include "hw/devices.h" +#include "hw/sh4/sh.h" +#include "hw/arm/devices.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/pci/pci.h" @@ -35,7 +35,7 @@ #include "hw/ide.h" #include "hw/loader.h" #include "hw/usb.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index e4d37ad6ac..d72708ee27 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -24,11 +24,11 @@ */ #include <stdio.h> #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "sysemu/sysemu.h" #include "hw/sh7750_regs.h" #include "hw/sh7750_regnames.h" -#include "hw/sh_intc.h" +#include "hw/sh4/sh_intc.h" #include "cpu.h" #include "exec/address-spaces.h" diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c index 389698d24a..7a3cdf3248 100644 --- a/hw/sh4/sh7750_regnames.c +++ b/hw/sh4/sh7750_regnames.c @@ -1,5 +1,5 @@ #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "hw/sh7750_regs.h" #include "hw/sh7750_regnames.h" diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index 192579d065..c23d4afb10 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -28,7 +28,7 @@ More information in target-sh4/README.sh4 */ #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" |