diff mbox

[PULL,00/36] target-arm queue

Message ID CAFEAcA81W5nJpM8mF7MvHTyKm5DX_mfKNUenoir3WWhqJXbMTg@mail.gmail.com
State New
Headers show

Commit Message

Peter Maydell Feb. 18, 2016, 3:19 p.m. UTC 
On 18 February 2016 at 14:34, Peter Maydell <peter.maydell@linaro.org> wrote:
> ARM pullreq with a whole pile of stuff; QOMification of SD cards
> is perhaps the biggest individual thing here.
>
> thanks
> -- PMM
>
> The following changes since commit 339b665c883b209982fa161dc090ffaf242ab12b:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160218' into staging (2016-02-18 10:29:47 +0000)
>
> are available in the git repository at:
>
>
>   git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20160218

Minor fixup needed for the w32 compiler that doesn't like duplicate
typedefs, to the "hw/sd/pxa2xx_mmci: convert to SysBusDevice object"
patch:


New cover letter coming up shortly.

-- PMM
diff mbox

Patch

diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index cadbba3..e3753e5 100644
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -21,7 +21,7 @@ 
 #define TYPE_PXA2XX_MMCI "pxa2xx-mmci"
 #define PXA2XX_MMCI(obj) OBJECT_CHECK(PXA2xxMMCIState, (obj), TYPE_PXA2XX_MMCI)

-typedef struct PXA2xxMMCIState {
+struct PXA2xxMMCIState {
     SysBusDevice parent_obj;

     MemoryRegion iomem;
@@ -57,7 +57,7 @@  typedef struct PXA2xxMMCIState {
     int resp_len;

     int cmdreq;
-} PXA2xxMMCIState;
+};

 #define MMC_STRPCL     0x00    /* MMC Clock Start/Stop register */
 #define MMC_STAT       0x04    /* MMC Status register */