Re: [PATCH 1/2] MMC / TMIO: Fix build issue related to struct scatterlist

On Wednesday, July 27, 2011, Chris Ball wrote:

Hi Rafael,

On Tue, Jul 26 2011, Rafael J. Wysocki wrote:

quoted

From: Rafael J. Wysocki <redacted>

Fix build issue caused by undefined struct scatterlist in
drivers/mmc/host/tmio_mmc.c.

Signed-off-by: Rafael J. Wysocki <redacted>
---
 drivers/mmc/host/tmio_mmc.h      |    1 +
 drivers/usb/renesas_usbhs/fifo.c |    1 +
 2 files changed, 2 insertions(+)

Index: linux-2.6/drivers/mmc/host/tmio_mmc.h
===================================================================

--- linux-2.6.orig/drivers/mmc/host/tmio_mmc.h
+++ linux-2.6/drivers/mmc/host/tmio_mmc.h

@@ -21,6 +21,7 @@
 #include <linux/mutex.h>
 #include <linux/pagemap.h>
 #include <linux/spinlock.h>
+#include <linux/scatterlist.h>
 
 /* Definitions for values the CTRL_SDIO_STATUS register can take. */
 #define TMIO_SDIO_STAT_IOIRQ	0x0001

I'm not able to reproduce the build failure here.

drivers/mmc/host/tmio_mmc.c already performs "#include <linux/scatterlist.h>"
itself (and always has done), so I'm confused about why this is necessary.
Do you have a copy of your build log with the error?

tmio_mmc.h is included by sh_mobile_sdhi.c too and that one doesn't include
scatterlist.h, which causes a build failure to happen, becuase of the
bounce_sg member of struct tmio_mmc_host.

The patch has been merged already anyway.

Thanks,
Rafael