diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2013-03-23 14:23:26 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-23 14:23:26 +0000 |
commit | f7c61bf8fc1b05613b49d1dd2300d1a1fbc927de (patch) | |
tree | 3c25bcedc8bceaf355720888604c8c251f3c68c4 /hw/milkymist-hw.h | |
parent | d76bb73549fcac07524aea5135280ea533a94fd6 (diff) | |
parent | b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af (diff) |
Merge branch 'for-upstream' of git://github.com/mwalle/qemu
* 'for-upstream' of git://github.com/mwalle/qemu:
configure: rename OpenGL feature to GLX
configure: proper OpenGL/GLX probe
target-lm32: use HELPER() macro
target-lm32: flush tlb after clearing env
target-lm32: remove dead code
target-lm32: fix cmpgui and cmpgeui opcodes
tests: tcg: lm32: add more test cases
target-lm32: don't log cpu state in translation
lm32_uart: fix receive buffering
milkymist-uart: fix receive buffering
lm32-dis: fix NULL pointer dereference
target-lm32: fix debug memory access
Diffstat (limited to 'hw/milkymist-hw.h')
-rw-r--r-- | hw/milkymist-hw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h index ced1c5f54e..c047a70a9f 100644 --- a/hw/milkymist-hw.h +++ b/hw/milkymist-hw.h @@ -87,7 +87,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, return dev; } -#ifdef CONFIG_OPENGL +#ifdef CONFIG_GLX #include <X11/Xlib.h> #include <GL/glx.h> static const int glx_fbconfig_attr[] = { @@ -101,7 +101,7 @@ static const int glx_fbconfig_attr[] = { static inline DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq) { -#ifdef CONFIG_OPENGL +#ifdef CONFIG_GLX DeviceState *dev; Display *d; GLXFBConfig *configs; |