Merge commit 'gnu/master' into test

[qemu] / hw / omap_mmc.c

diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c
index fd557c4..81c003c 100644 (file)
--- a/hw/omap_mmc.c
+++ b/hw/omap_mmc.c
@@ -112,7 +112,7 @@ static void omap_mmc_command(struct omap_mmc_s *host, int cmd, int dir,
 {
     uint32_t rspstatus, mask;
     int rsplen, timeout;
-    struct sd_request_s request;
+    SDRequest request;
     uint8_t response[16];
 
     if (init && cmd == 0) {