Hi all, After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this: In file included from include/linux/kernel.h:14:0, from include/linux/debug_locks.h:4, from include/linux/lockdep.h:23, from include/linux/sysfs.h:18, from include/linux/kobject.h:21, from include/linux/device.h:17, from arch/powerpc/include/asm/io.h:27, from include/linux/io.h:22, from drivers/mmc/host/sdhci-of-esdhc.c:17: drivers/mmc/host/sdhci-of-esdhc.c: In function 'esdhc_of_set_clock': drivers/mmc/host/sdhci-of-esdhc.c:230:10: error: 'host_clock' undeclared (first use in this function) clock, host_clock / pre_div / div); ^ include/linux/dynamic_debug.h:87:9: note: in definition of macro 'dynamic_dev_dbg' ##__VA_ARGS__); \ ^ drivers/mmc/host/sdhci-of-esdhc.c:229:2: note: in expansion of macro 'dev_dbg' dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n", ^ Caused by commit d31fc00a71b4 ("mmc: sdhci-esdhc: move common esdhc_set_clock to platform driver") from the mmc tree. I applied this temporary fix (reverting looked too hard): From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Fri, 27 Sep 2013 18:28:29 +1000 Subject: [PATCH] mmc: sdhci-esdhc: temporary build fix Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- drivers/mmc/host/sdhci-of-esdhc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index b1605a1..82d22ff 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -226,8 +226,8 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock) while (host->max_clk / pre_div / div > clock && div < 16) div++; - dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n", - clock, host_clock / pre_div / div); + // dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n", + // clock, host_clock / pre_div / div); pre_div >>= 1; div--; -- 1.8.4.rc3 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpva4Q3ld27F.pgp
Description: PGP signature