Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170717-pull-request' into...

[qemu.git] / hw / misc / imx31_ccm.c

diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c
index 1c03e52c40d529a6cbee7a4d6b41f6f12f095363..b890c383be177646af50983bb860d4edcab0a69b 100644 (file)
--- a/hw/misc/imx31_ccm.c
+++ b/hw/misc/imx31_ccm.c
@@ -29,7 +29,7 @@
         } \
     } while (0)
 
-static char const *imx31_ccm_reg_name(uint32_t reg)
+static const char *imx31_ccm_reg_name(uint32_t reg)
 {
     static char unknown[20];