diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-03-17 16:23:19 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-03-17 16:23:19 +0000 |
| commit | 103f9af2a1ad6427533ae2c92d9e1e721b2ae902 (patch) | |
| tree | 28d1d8db605390fe5c806791a04e7600701eb2c2 /hw/arm_mptimer.c | |
| parent | 69784eaec335d09619639db4da6c1e4770290526 (diff) | |
| parent | 14dd5faa7e168d70760902c269dc68f3104b8ed6 (diff) | |
| download | focaccia-qemu-103f9af2a1ad6427533ae2c92d9e1e721b2ae902.tar.gz focaccia-qemu-103f9af2a1ad6427533ae2c92d9e1e721b2ae902.zip | |
Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
* 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm: hw/pxa2xx.c: Fix handling of pxa2xx_i2c variable offset within region hw/pxa2xx_lcd.c: drop target_phys_addr_t usage in device state hw/pxa2xx_dma.c: drop target_phys_addr_t usage in device state ARM: Remove unnecessary subpage workarounds hw/omap_i2c: Convert to qdev
Diffstat (limited to 'hw/arm_mptimer.c')
| -rw-r--r-- | hw/arm_mptimer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c index 361e887dec..df7fb4c9bd 100644 --- a/hw/arm_mptimer.c +++ b/hw/arm_mptimer.c @@ -97,7 +97,6 @@ static uint64_t timerblock_read(void *opaque, target_phys_addr_t addr, { timerblock *tb = (timerblock *)opaque; int64_t val; - addr &= 0x1f; switch (addr) { case 0: /* Load */ return tb->load; @@ -126,7 +125,6 @@ static void timerblock_write(void *opaque, target_phys_addr_t addr, { timerblock *tb = (timerblock *)opaque; int64_t old; - addr &= 0x1f; switch (addr) { case 0: /* Load */ tb->load = value; |