Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-09-10' into staging

[qemu.git] / hw / char / sh_serial.c

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 6223a557b2be6ffbf2a2ab3461ee8813f45bbe76..9328dd1b5745e043cbf9e38fdb1ec774d3334e5c 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -248,11 +248,9 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
                     s->flags &= ~SH_SERIAL_FLAG_RDF;
             }
             break;
-#if 0
         case 0x18:
             ret = s->fcr;
             break;
-#endif
         case 0x1c:
             ret = s->rx_cnt;
             break;