Hi all, After merging the tip tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/i2c/busses/i2c-designware-core.c: In function 'i2c_dw_wait_bus_not_busy': drivers/i2c/busses/i2c-designware-core.c:321: error: implicit declaration of function 'mdelay' Caused by commit 800c56383dcb ("i2c-designware: split of i2c-designware.c into core and bus specific parts") from the bjdooks-i2c tree and exposed by commit ca444564a947 ("x86: Stop including <linux/delay.h> in two asm header files"). I have added this patch for today: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Fri, 1 Apr 2011 12:48:53 +1100 Subject: [PATCH] i2c-designware: mdelay use needs linux/delay.h inclusion Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- drivers/i2c/busses/i2c-designware-core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index 299e717..f87e25a 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c @@ -25,6 +25,7 @@ * ---------------------------------------------------------------------------- * */ +#include <linux/delay.h> #include <linux/clk.h> #include <linux/errno.h> #include <linux/err.h> -- 1.7.4.1 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html