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
/
bbc_i2c.c
diff --git
a/drivers/sbus/char/bbc_i2c.c
b/drivers/sbus/char/bbc_i2c.c
index
7186235
..
3e156e0
100644
(file)
--- a/
drivers/sbus/char/bbc_i2c.c
+++ b/
drivers/sbus/char/bbc_i2c.c
@@
-377,7
+377,7
@@
static int __init attach_one_i2c(struct linux_ebus_device *edev, int index)
bp->waiting = 0;
init_waitqueue_head(&bp->wq);
if (request_irq(edev->irqs[0], bbc_i2c_interrupt,
bp->waiting = 0;
init_waitqueue_head(&bp->wq);
if (request_irq(edev->irqs[0], bbc_i2c_interrupt,
-
IRQF_SHARED
, "bbc_i2c", bp))
+
SA_SHIRQ
, "bbc_i2c", bp))
goto fail;
bp->index = index;
goto fail;
bp->index = index;
@@
-423,7
+423,7
@@
static int __init bbc_present(void)
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
- if (!strcmp(edev->prom_n
ode->n
ame, "bbc"))
+ if (!strcmp(edev->prom_name, "bbc"))
return 1;
}
}
return 1;
}
}
@@
-446,7
+446,7
@@
static int __init bbc_i2c_init(void)
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
- if (!strcmp(edev->prom_n
ode->n
ame, "i2c")) {
+ if (!strcmp(edev->prom_name, "i2c")) {
if (!attach_one_i2c(edev, index))
index++;
}
if (!attach_one_i2c(edev, index))
index++;
}