Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c37f271320d595f46beb5a0ab7833107f461f6b6
Commit: c37f271320d595f46beb5a0ab7833107f461f6b6
Parent: a9cb3959ace112295fdb65c99a2928eedba06926
Author: Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 7 16:06:43 2007 -0700
Committer: Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Sun Jun 10 19:58:00 2007 +0000
[WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix
little fiddles.
Cc: Haavard Skinnemoen <[EMAIL PROTECTED]>
Cc: Hans-Christian Egtvedt <[EMAIL PROTECTED]>
Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/char/watchdog/at32ap700x_wdt.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/char/watchdog/at32ap700x_wdt.c
b/drivers/char/watchdog/at32ap700x_wdt.c
index 036d83b..588b26d 100644
--- a/drivers/char/watchdog/at32ap700x_wdt.c
+++ b/drivers/char/watchdog/at32ap700x_wdt.c
@@ -16,9 +16,8 @@
#include <linux/fs.h>
#include <linux/platform_device.h>
#include <linux/watchdog.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
#define TIMEOUT_MIN 1
#define TIMEOUT_DEFAULT CONFIG_AT32AP700X_WDT_TIMEOUT
@@ -120,7 +119,10 @@ static int at32_wdt_settimeout(int time)
if ((time < TIMEOUT_MIN) || (time > TIMEOUT_MAX))
return -EINVAL;
- /* Set new watchdog time. It will be used when at32_wdt_start() is
called. */
+ /*
+ * Set new watchdog time. It will be used when at32_wdt_start() is
+ * called.
+ */
wdt->timeout = time;
return 0;
}
@@ -141,7 +143,7 @@ static int at32_wdt_ioctl(struct inode *inode, struct file
*file,
void __user *argp = (void __user *)arg;
int __user *p = argp;
- switch(cmd) {
+ switch (cmd) {
case WDIOC_KEEPALIVE:
at32_wdt_pat();
ret = 0;
@@ -182,7 +184,8 @@ static int at32_wdt_ioctl(struct inode *inode, struct file
*file,
return ret;
}
-static ssize_t at32_wdt_write(struct file *file, const char *data, size_t len,
loff_t *ppos)
+static ssize_t at32_wdt_write(struct file *file, const char *data, size_t len,
+ loff_t *ppos)
{
at32_wdt_pat();
return len;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
