diff options
| author | Andreas Färber <andreas.faerber@web.de> | 2013-01-10 21:52:28 +0100 |
|---|---|---|
| committer | Andreas Färber <andreas.faerber@web.de> | 2013-01-10 21:52:28 +0100 |
| commit | 63e3555e80c31776285accbb4d0c14ae91c457dc (patch) | |
| tree | 89907c82724d6519c8bbad7acc15c0198c6f902f /hw/arm/Makefile.objs | |
| parent | 52a71bff6085398fbb8602718af228cd6339c02d (diff) | |
| parent | a6308bc2224db238e72c570482717b68246a7ce0 (diff) | |
Merge branch 'master' of git://git.qemu.org/qemu into prep-up
Conflicts:
hw/Makefile.objs
hw/ppc_prep.c
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Diffstat (limited to 'hw/arm/Makefile.objs')
| -rw-r--r-- | hw/arm/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 2b39fb3c85..6d049e7de6 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,6 +1,7 @@ obj-y = integratorcp.o versatilepb.o arm_pic.o obj-y += arm_boot.o obj-y += xilinx_zynq.o zynq_slcr.o +obj-y += xilinx_spips.o obj-y += arm_gic.o arm_gic_common.o obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o |