]> git.proxmox.com Git - mirror_qemu.git/commit - hw/cpu/arm11mpcore.c
hw/mpcore.c: Merge with hw/arm11mpcore.c
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 5 Dec 2011 14:09:18 +0000 (14:09 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 12 Dec 2011 10:26:31 +0000 (10:26 +0000)
commit2a6ab1e368c07569b0d884634dcf9e9f7cbb6fca
tree717d8bed657a303939254725e84235bfb3be95fa
parentb12080cd50f93642b3899068900b80bc867b1a38
hw/mpcore.c: Merge with hw/arm11mpcore.c

hw/mpcore.c is now implementing only ARM11MPCore specific peripherals,
and is #included only from hw/arm11mpcore.c, so just merge it into that
file.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/arm11mpcore.c
hw/mpcore.c [deleted file]