diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-03 08:37:44 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-03 08:37:44 -0500 |
| commit | 7087d3df18b8e8d27a2115dfc5d56614073e55de (patch) | |
| tree | c4fa196641d565e8a3474d240584beaf10495084 /hw/display | |
| parent | f10acc8b38d65a66ffa0588a036489d7fa6a593e (diff) | |
| parent | a4cc73d629d43c8a4d171d043ff229a959df3ca6 (diff) | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Ed Maste (3) and others
# Via Michael Tokarev
* mjt/trivial-patches:
do not check pointers after dereferencing them
m25p80: Add Micron n25q032a
qemu: fix out of tree cross compile
slirp: cleanup leftovers from misc.h
migration: Remove duplicate bandwidth_limit set
docs: Fix typo and update file in migration
configure: try pkg-config ncurses first
rtc: remove rtc_set_date
linux-user: Fix typo in comment
configure: remove confusing file manipulation
debugcon: fix compiler warning when open DEBUG_DEBUGCON
debugcon: make debug message more readable
debugcon: fix always print "addr=0x0, val=0x0" bug when use DEBUG_DEBUGCON
Remove unnecessary break statements
don't run pkg-config for features explicitly disabled
Message-id: 51A9CCFB.1000109@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/cirrus_vga.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 64bfe2be4a..a5dbc39c21 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2600,7 +2600,6 @@ static void cirrus_vga_ioport_write(void *opaque, hwaddr addr, uint64_t val, #endif cirrus_vga_write_sr(c, val); break; - break; case 0x3c6: cirrus_write_hidden_dac(c, val); break; |