From 6cfb5aa836884bcd66e2c5d0a101e97ba78aaafd Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Mon, 21 May 2012 15:31:06 +0200 Subject: watchdog: correct the name of the watchdog_core inlude file The watchdog_core include file should have been named watchdog_core.h and not watchdog_dev.h . Correct this. Signed-off-by: Wim Van Sebroeck --- drivers/watchdog/watchdog_core.c | 2 +- drivers/watchdog/watchdog_core.h | 33 +++++++++++++++++++++++++++++++++ drivers/watchdog/watchdog_dev.c | 2 +- drivers/watchdog/watchdog_dev.h | 33 --------------------------------- 4 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 drivers/watchdog/watchdog_core.h delete mode 100644 drivers/watchdog/watchdog_dev.h diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index 14d768bfa26..8598308278d 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -35,7 +35,7 @@ #include /* For watchdog specific items */ #include /* For __init/__exit/... */ -#include "watchdog_dev.h" /* For watchdog_dev_register/... */ +#include "watchdog_core.h" /* For watchdog_dev_register/... */ /** * watchdog_register_device() - register a watchdog device diff --git a/drivers/watchdog/watchdog_core.h b/drivers/watchdog/watchdog_core.h new file mode 100644 index 00000000000..bc7612be25c --- /dev/null +++ b/drivers/watchdog/watchdog_core.h @@ -0,0 +1,33 @@ +/* + * watchdog_core.h + * + * (c) Copyright 2008-2011 Alan Cox , + * All Rights Reserved. + * + * (c) Copyright 2008-2011 Wim Van Sebroeck . + * + * This source code is part of the generic code that can be used + * by all the watchdog timer drivers. + * + * Based on source code of the following authors: + * Matt Domsch , + * Rob Radez , + * Rusty Lynch + * Satyam Sharma + * Randy Dunlap + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. + * admit liability nor provide warranty for any of this software. + * This material is provided "AS-IS" and at no charge. + */ + +/* + * Functions/procedures to be called by the core + */ +int watchdog_dev_register(struct watchdog_device *); +int watchdog_dev_unregister(struct watchdog_device *); diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 930cc7c8745..beaf9cb5541 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -42,7 +42,7 @@ #include /* For __init/__exit/... */ #include /* For copy_to_user/put_user/... */ -#include "watchdog_dev.h" +#include "watchdog_core.h" /* make sure we only register one /dev/watchdog device */ static unsigned long watchdog_dev_busy; diff --git a/drivers/watchdog/watchdog_dev.h b/drivers/watchdog/watchdog_dev.h deleted file mode 100644 index bc7612be25c..00000000000 --- a/drivers/watchdog/watchdog_dev.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * watchdog_core.h - * - * (c) Copyright 2008-2011 Alan Cox , - * All Rights Reserved. - * - * (c) Copyright 2008-2011 Wim Van Sebroeck . - * - * This source code is part of the generic code that can be used - * by all the watchdog timer drivers. - * - * Based on source code of the following authors: - * Matt Domsch , - * Rob Radez , - * Rusty Lynch - * Satyam Sharma - * Randy Dunlap - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * - * Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. - * admit liability nor provide warranty for any of this software. - * This material is provided "AS-IS" and at no charge. - */ - -/* - * Functions/procedures to be called by the core - */ -int watchdog_dev_register(struct watchdog_device *); -int watchdog_dev_unregister(struct watchdog_device *); -- cgit v1.2.3