diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-22 15:19:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-22 15:19:21 +0000 |
| commit | 047e363b05679724d6b784c6ec6310697fe48ba0 (patch) | |
| tree | 17570c0192a633520edf87b8371e4b0befaf82fc /hw/misc/imx25_ccm.c | |
| parent | 3c2c85ec4b112e3e2b899472314d5da6880fdf0e (diff) | |
| parent | 7ceac86f49b564954f5bde477c4281f407be1399 (diff) | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-softfloat-20160122' into staging
softfloat:
* drop confusing softfloat-only types
* fix return type of roundAndPackFloat16
# gpg: Signature made Fri 22 Jan 2016 15:15:17 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
* remotes/pmaydell/tags/pull-softfloat-20160122:
softfloat: fix return type of roundAndPackFloat16
fpu: Replace uint8 typedef with uint8_t
fpu: Replace int8 typedef with int8_t
fpu: Replace uint32 typedef with uint32_t
fpu: Replace int32 typedef with int32_t
fpu: Replace uint64 typedef with uint64_t
fpu: Replace int64 typedef with int64_t
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/imx25_ccm.c')
| -rw-r--r-- | hw/misc/imx25_ccm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c index 23759ca648..90752fd7a1 100644 --- a/hw/misc/imx25_ccm.c +++ b/hw/misc/imx25_ccm.c @@ -249,7 +249,7 @@ static void imx25_ccm_reset(DeviceState *dev) static uint64_t imx25_ccm_read(void *opaque, hwaddr offset, unsigned size) { - uint32 value = 0; + uint32_t value = 0; IMX25CCMState *s = (IMX25CCMState *)opaque; if (offset < 0x70) { |