git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
[safe/jmp/linux-2.6]
/
drivers
/
watchdog
/
sc1200wdt.c
diff --git
a/drivers/watchdog/sc1200wdt.c
b/drivers/watchdog/sc1200wdt.c
index
23da3cc
..
c01daca
100644
(file)
--- a/
drivers/watchdog/sc1200wdt.c
+++ b/
drivers/watchdog/sc1200wdt.c
@@
-71,7
+71,7
@@
#define UART2_IRQ 0x04 /* Serial1 */
/* 5 -7 are reserved */
#define UART2_IRQ 0x04 /* Serial1 */
/* 5 -7 are reserved */
-static char banner[] __initdata =
KERN_INFO
PFX SC1200_MODULE_VER;
+static char banner[] __initdata = PFX SC1200_MODULE_VER;
static int timeout = 1;
static int io = -1;
static int io_len = 2; /* for non plug and play */
static int timeout = 1;
static int io = -1;
static int io_len = 2; /* for non plug and play */
@@
-197,7
+197,7
@@
static long sc1200wdt_ioctl(struct file *file, unsigned int cmd,
switch (cmd) {
case WDIOC_GETSUPPORT:
switch (cmd) {
case WDIOC_GETSUPPORT:
- if (copy_to_user(argp, &ident, sizeof
ident
))
+ if (copy_to_user(argp, &ident, sizeof
(ident)
))
return -EFAULT;
return 0;
return -EFAULT;
return 0;
@@
-392,7
+392,7
@@
static int __init sc1200wdt_init(void)
{
int ret;
{
int ret;
- printk("%s\n", banner);
+ printk(
KERN_INFO
"%s\n", banner);
#if defined CONFIG_PNP
if (isapnp) {
#if defined CONFIG_PNP
if (isapnp) {
@@
-477,6
+477,7
@@
module_init(sc1200wdt_init);
module_exit(sc1200wdt_exit);
MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>");
module_exit(sc1200wdt_exit);
MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>");
-MODULE_DESCRIPTION("Driver for National Semiconductor PC87307/PC97307 watchdog component");
+MODULE_DESCRIPTION(
+ "Driver for National Semiconductor PC87307/PC97307 watchdog component");
MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);