From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45049 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q9HFZ-0006sw-T4 for qemu-devel@nongnu.org; Mon, 11 Apr 2011 09:33:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9HFV-00035K-9H for qemu-devel@nongnu.org; Mon, 11 Apr 2011 09:33:50 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:33936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9HFV-00034N-5B for qemu-devel@nongnu.org; Mon, 11 Apr 2011 09:33:49 -0400 Received: by mail-wy0-f173.google.com with SMTP id 42so5398086wyb.4 for ; Mon, 11 Apr 2011 06:33:48 -0700 (PDT) From: Dmitry Eremin-Solenikov Date: Mon, 11 Apr 2011 17:33:38 +0400 Message-Id: <1302528819-24228-7-git-send-email-dbaryshkov@gmail.com> In-Reply-To: <1302528819-24228-1-git-send-email-dbaryshkov@gmail.com> References: <1302528819-24228-1-git-send-email-dbaryshkov@gmail.com> Subject: [Qemu-devel] [PATCH 6/7] pxa: change order of pcmcia devices instantiation, so that the socket 0 will be default List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Dmitry Eremin-Solenikov --- hw/pxa2xx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index ef4c0a2..bcb42cf 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c @@ -2222,8 +2222,8 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision) qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1)); } - s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); s->pcmcia[1] = pxa2xx_pcmcia_init(0x30000000, 1); + s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); sysbus_create_simple("pxa2xx_rtc", 0x40900000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM)); @@ -2358,8 +2358,8 @@ PXA2xxState *pxa255_init(unsigned int sdram_size) qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1)); } - s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); s->pcmcia[1] = pxa2xx_pcmcia_init(0x30000000, 1); + s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000, 0); sysbus_create_simple("pxa2xx_rtc", 0x40900000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM)); -- 1.7.4.1