From bd2be1500337f0349f70802e4d8d43f5aca61477 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 9 Apr 2013 15:26:55 +0100 Subject: arm: fix location of some include files The recent rearrangement of include files had some minor errors: devices.h is not ARM specific and should not be in arm/ arm.h should be in arm/ Move these two headers to correct this. Signed-off-by: Peter Maydell Signed-off-by: Paolo Bonzini --- hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 2 +- hw/arm/collie.c | 4 ++-- hw/arm/exynos4210.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/gumstix.c | 2 +- hw/arm/highbank.c | 4 ++-- hw/arm/integratorcp.c | 4 ++-- hw/arm/kzm.c | 4 ++-- hw/arm/mainstone.c | 4 ++-- hw/arm/musicpal.c | 4 ++-- hw/arm/nseries.c | 4 ++-- hw/arm/omap1.c | 2 +- hw/arm/omap2.c | 2 +- hw/arm/omap_sx1.c | 2 +- hw/arm/palm.c | 4 ++-- hw/arm/pic_cpu.c | 2 +- hw/arm/realview.c | 4 ++-- hw/arm/spitz.c | 4 ++-- hw/arm/stellaris.c | 4 ++-- hw/arm/strongarm.c | 2 +- hw/arm/tosa.c | 4 ++-- hw/arm/versatilepb.c | 4 ++-- hw/arm/vexpress.c | 4 ++-- hw/arm/xilinx_zynq.c | 2 +- hw/arm/z2.c | 4 ++-- 26 files changed, 41 insertions(+), 41 deletions(-) (limited to 'hw/arm') diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index a4bdd5f..2ae3576 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -8,7 +8,7 @@ */ #include "hw/sysbus.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index c79c590..e9c0945 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -9,7 +9,7 @@ #include "config.h" #include "hw/hw.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 5420bb4..a19857a 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -11,9 +11,9 @@ #include "hw/hw.h" #include "hw/sysbus.h" #include "hw/boards.h" -#include "hw/arm/devices.h" +#include "hw/devices.h" #include "strongarm.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 78b8b74..c8101d3 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -24,7 +24,7 @@ #include "hw/boards.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/loader.h" #include "hw/arm/exynos4210.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index ba14a1f..74f110b 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -24,7 +24,7 @@ #include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "net/net.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "exec/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/boards.h" diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index 4d800c9..b8cab10 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -38,7 +38,7 @@ #include "hw/arm/pxa.h" #include "net/net.h" #include "hw/block/flash.h" -#include "hw/arm/devices.h" +#include "hw/devices.h" #include "hw/boards.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 58f73c1..0fd9465 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -18,8 +18,8 @@ */ #include "hw/sysbus.h" -#include "hw/arm.h" -#include "hw/arm/devices.h" +#include "hw/arm/arm.h" +#include "hw/devices.h" #include "hw/loader.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 8d0fb75..cca2971 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -8,9 +8,9 @@ */ #include "hw/sysbus.h" -#include "hw/arm/devices.h" +#include "hw/devices.h" #include "hw/boards.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "net/net.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 46264cd..cf90f5d 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -16,8 +16,8 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "hw/hw.h" -#include "hw/arm.h" -#include "hw/arm/devices.h" +#include "hw/arm/arm.h" +#include "hw/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index b78e6f0..260e314 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -13,9 +13,9 @@ */ #include "hw/hw.h" #include "hw/arm/pxa.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "net/net.h" -#include "hw/arm/devices.h" +#include "hw/devices.h" #include "hw/boards.h" #include "hw/block/flash.h" #include "sysemu/blockdev.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 97b1340..d2247fa 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -10,8 +10,8 @@ */ #include "hw/sysbus.h" -#include "hw/arm.h" -#include "hw/arm/devices.h" +#include "hw/arm/arm.h" +#include "hw/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index ba8dc3e..4976438 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -21,12 +21,12 @@ #include "qemu-common.h" #include "sysemu/sysemu.h" #include "hw/arm/omap.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/irq.h" #include "ui/console.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" -#include "hw/arm/devices.h" +#include "hw/devices.h" #include "hw/block/flash.h" #include "hw/hw.h" #include "hw/bt.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 17caa61..f59f0f2 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -17,7 +17,7 @@ * with this program; if not, see . */ #include "hw/hw.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h" #include "hw/arm/soc_dma.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 010c483..a4b4146 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -20,7 +20,7 @@ #include "sysemu/blockdev.h" #include "hw/hw.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h" #include "qemu/timer.h" diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index aa85602..e421ece 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -29,7 +29,7 @@ #include "ui/console.h" #include "hw/arm/omap.h" #include "hw/boards.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 0bc11ae..b13d810 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -22,8 +22,8 @@ #include "ui/console.h" #include "hw/arm/omap.h" #include "hw/boards.h" -#include "hw/arm.h" -#include "hw/arm/devices.h" +#include "hw/arm/arm.h" +#include "hw/devices.h" #include "hw/loader.h" #include "exec/address-spaces.h" diff --git a/hw/arm/pic_cpu.c b/hw/arm/pic_cpu.c index 787767f..875280a 100644 --- a/hw/arm/pic_cpu.c +++ b/hw/arm/pic_cpu.c @@ -8,7 +8,7 @@ */ #include "hw/hw.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "sysemu/kvm.h" /* Input 0 is IRQ and input 1 is FIQ. */ diff --git a/hw/arm/realview.c b/hw/arm/realview.c index afd52d3..feabfc5 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -8,9 +8,9 @@ */ #include "hw/sysbus.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/arm/primecell.h" -#include "hw/arm/devices.h" +#include "hw/devices.h" #include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index fa434dc..c42668a 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -12,14 +12,14 @@ #include "hw/hw.h" #include "hw/arm/pxa.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "sysemu/sysemu.h" #include "hw/pcmcia.h" #include "hw/i2c/i2c.h" #include "hw/ssi.h" #include "hw/block/flash.h" #include "qemu/timer.h" -#include "hw/arm/devices.h" +#include "hw/devices.h" #include "hw/arm/sharpsl.h" #include "ui/console.h" #include "block/block.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 952087c..2b61e3c 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -9,8 +9,8 @@ #include "hw/sysbus.h" #include "hw/ssi.h" -#include "hw/arm.h" -#include "hw/arm/devices.h" +#include "hw/arm/arm.h" +#include "hw/devices.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "net/net.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 5873a3c..75a813e 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" #include "strongarm.h" #include "qemu/error-report.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "char/char.h" #include "sysemu/sysemu.h" #include "hw/ssi.h" diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index c4362d4..47818a5 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -13,8 +13,8 @@ #include "hw/hw.h" #include "hw/arm/pxa.h" -#include "hw/arm.h" -#include "hw/arm/devices.h" +#include "hw/arm/arm.h" +#include "hw/devices.h" #include "hw/arm/sharpsl.h" #include "hw/pcmcia.h" #include "block/block.h" diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index d9be604..25c665a 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -8,8 +8,8 @@ */ #include "hw/sysbus.h" -#include "hw/arm.h" -#include "hw/arm/devices.h" +#include "hw/arm/arm.h" +#include "hw/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 96e0985..a077c62 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -22,9 +22,9 @@ */ #include "hw/sysbus.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "hw/arm/primecell.h" -#include "hw/arm/devices.h" +#include "hw/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 8d65f79..41505c3 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -16,7 +16,7 @@ */ #include "hw/sysbus.h" -#include "hw/arm.h" +#include "hw/arm/arm.h" #include "net/net.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 3e27208..07a127b 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -13,8 +13,8 @@ #include "hw/hw.h" #include "hw/arm/pxa.h" -#include "hw/arm.h" -#include "hw/arm/devices.h" +#include "hw/arm/arm.h" +#include "hw/devices.h" #include "hw/i2c/i2c.h" #include "hw/ssi.h" #include "hw/boards.h" -- cgit v1.1