git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
sbus
/
char
/
cpwatchdog.c
diff --git
a/drivers/sbus/char/cpwatchdog.c
b/drivers/sbus/char/cpwatchdog.c
index
836a58b
..
fd2cc77
100644
(file)
--- a/
drivers/sbus/char/cpwatchdog.c
+++ b/
drivers/sbus/char/cpwatchdog.c
@@
-301,11
+301,11
@@
static int wd_open(struct inode *inode, struct file *f)
{
if (request_irq(wd_dev.irq,
&wd_interrupt,
{
if (request_irq(wd_dev.irq,
&wd_interrupt,
-
IRQF_SHARED
,
+
SA_SHIRQ
,
WD_OBPNAME,
(void *)wd_dev.regs)) {
WD_OBPNAME,
(void *)wd_dev.regs)) {
- printk("%s: Cannot register IRQ %
d
\n",
- WD_OBPNAME,
wd_dev.irq
);
+ printk("%s: Cannot register IRQ %
s
\n",
+ WD_OBPNAME,
__irq_itoa(wd_dev.irq)
);
return(-EBUSY);
}
wd_dev.initialized = 1;
return(-EBUSY);
}
wd_dev.initialized = 1;
@@
-755,7
+755,7
@@
static int __init wd_init(void)
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
- if (!strcmp(edev->
ofdev.node->
name, WD_OBPNAME))
+ if (!strcmp(edev->
prom_
name, WD_OBPNAME))
goto ebus_done;
}
}
goto ebus_done;
}
}