Conditional code in tmio_mmc.h selects dummy tmio_mmc_start_dma(), tmio_mmc_request_dma() and tmio_mmc_release_dma() inline functions instead of the required declarations. This breaks the build of tmio_mmc_dma.c
Signed-off-by: Paul Parsons <lost.distance@xxxxxxxxx>
---
diff -uprN clean-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h linux-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h
--- clean-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h 2011-05-11 00:54:17.647289808 +0100
+++ linux-2.6.39-rc7/drivers/mmc/host/tmio_mmc.h 2011-05-14 16:30:47.208267896 +0100
@@ -98,26 +98,8 @@ static inline void tmio_mmc_kunmap_atomi
local_irq_restore(*flags);
}
-#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
void tmio_mmc_start_dma(struct tmio_mmc_host *host, struct mmc_data *data);
void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata);
void tmio_mmc_release_dma(struct tmio_mmc_host *host);
-#else
-static inline void tmio_mmc_start_dma(struct tmio_mmc_host *host,
- struct mmc_data *data)
-{
-}
-
-static inline void tmio_mmc_request_dma(struct tmio_mmc_host *host,
- struct tmio_mmc_data *pdata)
-{
- host->chan_tx = NULL;
- host->chan_rx = NULL;
-}
-
-static inline void tmio_mmc_release_dma(struct tmio_mmc_host *host)
-{
-}
-#endif
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
