diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-07 14:59:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-07 14:59:59 +0000 |
| commit | 4f0444fc6807d08620ac8eea7d7043d3d2a6ae6a (patch) | |
| tree | 807f3d0aab842510349b786caed6f90a799c5048 /hw/sparc64 | |
| parent | 632351e0e1a861f2eaf709b053c53f96a1225825 (diff) | |
| parent | e67e91b4b55331973f783ca89790ee9f7861ced1 (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging
Trivial patches:
* Update copyright
* Fix LGPL in target/moxie
* configure portability fix
* Drop useless inclusion of "hw/i386/pc.h"
* Mark the cpu-cluster device with user_creatable = false
* tsc210x: Fix building with no verbosity
# gpg: Signature made Wed 06 Feb 2019 15:27:35 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-patches-pull-request:
hw/input/tsc210x: Fix building with no verbosity
hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false
hw/unicore32/puv3: Drop useless inclusion of "hw/i386/pc.h"
hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h"
configure: Avoid non-portable 'test -o/-a'
target/moxie: Fix LGPL information in the file headers
qemu-common.h: Update copyright string for 2019
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/sparc64')
| -rw-r--r-- | hw/sparc64/sun4u.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index b9bd4be5d5..3d310f1d76 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -33,7 +33,6 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/pci-host/sabre.h" -#include "hw/i386/pc.h" #include "hw/char/serial.h" #include "hw/char/parallel.h" #include "hw/timer/m48t59.h" |