Hi all, After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/watchdog/watchdog_core.c: In function 'watchdog_register_device': drivers/watchdog/watchdog_core.c:109:2: error: implicit declaration of function 'IS_ERR' [-Werror=implicit-function-declaration] drivers/watchdog/watchdog_core.c:112:3: error: implicit declaration of function 'PTR_ERR' [-Werror=implicit-function-declaration] Caused by commit e3b97a7eb87d ("watchdog: create all the proper device files"). I have applied this fixup patch for today: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Wed, 23 May 2012 16:52:07 +1000 Subject: [PATCH] watchdog: usin IS_ERR needs linux/err.h Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- drivers/watchdog/watchdog_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index 534ed2a..1b42936 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -35,6 +35,7 @@ #include <linux/watchdog.h> /* For watchdog specific items */ #include <linux/init.h> /* For __init/__exit/... */ #include <linux/idr.h> /* For ida_* macros */ +#include <linux/err.h> #include "watchdog_core.h" /* For watchdog_dev_register/... */ -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpb5SL3aoBma.pgp
Description: PGP signature