aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-02-01 13:15:10 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-02-01 13:15:10 +0000
commita1bc3e7dc8f89facee6d3c25fb8465f8feccef1f (patch)
tree58e842b2a9f750412abb05190b7fd1709bbded5d /MAINTAINERS
parentcfe6c547690b06fbce54a6d0f7b05dd7f18e36ea (diff)
parent0015ca5cbabe0b31d31610ddfaafd90a9e5911a4 (diff)
downloadqemu-a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f.zip
qemu-a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f.tar.gz
qemu-a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f.tar.bz2
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190201-pull-request' into staging
ui: fix build with SDL disabled, drop SDL1 support. # gpg: Signature made Fri 01 Feb 2019 12:30:47 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20190201-pull-request: ui: remove support for SDL1.2 in favour of SDL2 hw/display/milkymist-tmu2: Move inlined code from header to source hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11 hw/display: Move Milkymist specific hardware out of common-obj list Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 234e5c4..37ceda4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -185,6 +185,7 @@ F: disas/lm32.c
F: hw/lm32/
F: hw/*/lm32_*
F: hw/*/milkymist-*
+F: include/hw/display/milkymist_tmu2.h
F: include/hw/char/lm32_juart.h
F: include/hw/lm32/
F: tests/tcg/lm32/