summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2012-05-21 15:31:06 +0200
committerWim Van Sebroeck <wim@iguana.be>2012-05-30 07:54:03 +0200
commit6cfb5aa836884bcd66e2c5d0a101e97ba78aaafd (patch)
treeba0dc48421be040e0577ea4ab8d1a3fa16aaa058
parentwatchdog: Add watchdog_active() routine (diff)
downloadlinux-6cfb5aa836884bcd66e2c5d0a101e97ba78aaafd.tar.xz
linux-6cfb5aa836884bcd66e2c5d0a101e97ba78aaafd.zip
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 <wim@iguana.be>
-rw-r--r--drivers/watchdog/watchdog_core.c2
-rw-r--r--drivers/watchdog/watchdog_core.h (renamed from drivers/watchdog/watchdog_dev.h)0
-rw-r--r--drivers/watchdog/watchdog_dev.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index 14d768bfa267..8598308278d3 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -35,7 +35,7 @@
#include <linux/watchdog.h> /* For watchdog specific items */
#include <linux/init.h> /* 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_dev.h b/drivers/watchdog/watchdog_core.h
index bc7612be25ce..bc7612be25ce 100644
--- a/drivers/watchdog/watchdog_dev.h
+++ b/drivers/watchdog/watchdog_core.h
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 930cc7c87457..beaf9cb5541a 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -42,7 +42,7 @@
#include <linux/init.h> /* For __init/__exit/... */
#include <linux/uaccess.h> /* 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;