summaryrefslogtreecommitdiff
path: root/hw/pxa2xx.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-05-08 22:51:00 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-05-08 22:51:00 +0000
commit3bdd58a4dfaf284868e7b34f29ae74c60ad23ac9 (patch)
treea1dc6a3014b7a3922c53c47365e7a33d668e1b2d /hw/pxa2xx.c
parent9617efe8e78fe977c8ddbb18d7b14b532ab07c3e (diff)
Correct the number of PXA255 GPIO lines. Reuse the PXA timers struct for PXA27x additional timers.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2789 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pxa2xx.c')
-rw-r--r--hw/pxa2xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index eb8bd15df4..4661011d7b 100644
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -1645,7 +1645,7 @@ struct pxa2xx_state_s *pxa255_init(unsigned int sdram_size,
pxa25x_timer_init(0x40a00000, &s->pic[PXA2XX_PIC_OST_0], s->env);
- s->gpio = pxa2xx_gpio_init(0x40e00000, s->env, s->pic, 121);
+ s->gpio = pxa2xx_gpio_init(0x40e00000, s->env, s->pic, 85);
s->mmc = pxa2xx_mmci_init(0x41100000, s->pic[PXA2XX_PIC_MMC], s->dma);