Hi Linus,
Please pull from 'master' branch of
git://www.linux-watchdog.org/linux-watchdog.git
It will fix a warning for watchdog-test.c and it will remove a duplicate
inlude of delay.h
This will update the following files:
Documentation/watchdog/src/watchdog-test.c | 2 +-
drivers/watchdog/da9052_wdt.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
with these Changes:
commit 3e5531caffcc07b67452c4a8170ffb4c2bd1c9b7
Author: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
Date: Tue Aug 7 15:14:12 2012 +0530
watchdog: da9052: Remove duplicate inclusion of delay.h
delay.h header file was included twice.
Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
commit 4b1c2f41c2dda158bb7a3dded70775a76b581995
Author: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Date: Mon Jul 23 10:46:11 2012 -0700
watchdog: fix watchdog-test.c build warning
Fix compiler warning by making the function static:
Documentation/watchdog/src/watchdog-test.c:34:6: warning: no previous prototype for 'term'
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
diff --git a/Documentation/watchdog/src/watchdog-test.c b/Documentation/watchdog/src/watchdog-test.c
index 73ff5cc..3da8229 100644
--- a/Documentation/watchdog/src/watchdog-test.c
+++ b/Documentation/watchdog/src/watchdog-test.c
@@ -31,7 +31,7 @@ static void keep_alive(void)
* or "-e" to enable the card.
*/
-void term(int sig)
+static void term(int sig)
{
close(fd);
fprintf(stderr, "Stopping watchdog ticks...\n");
diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index 3f75129..f7abbae 100644
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -21,7 +21,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
-#include <linux/delay.h>
#include <linux/mfd/da9052/reg.h>
#include <linux/mfd/da9052/da9052.h>
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
