From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753942Ab2H2PTN (ORCPT ); Wed, 29 Aug 2012 11:19:13 -0400 Received: from ns1.pc-advies.be ([83.149.101.17]:58306 "EHLO spo001.leaseweb.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753764Ab2H2PTL (ORCPT ); Wed, 29 Aug 2012 11:19:11 -0400 Date: Wed, 29 Aug 2012 17:19:09 +0200 From: Wim Van Sebroeck To: Linus Torvalds Cc: Andrew Morton , LKML , Linux Watchdog Mailing List , Randy Dunlap , Sachin Kamat Subject: [GIT PULL REQUEST] watchdog - v3.6-rc3 Fixes Message-ID: <20120829151909.GU27604@spo001.leaseweb.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 Signed-off-by: Wim Van Sebroeck commit 4b1c2f41c2dda158bb7a3dded70775a76b581995 Author: Randy Dunlap 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 Signed-off-by: Wim Van Sebroeck 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 #include #include -#include #include #include