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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
sbus
/
char
/
bbc_envctrl.c
diff --git
a/drivers/sbus/char/bbc_envctrl.c
b/drivers/sbus/char/bbc_envctrl.c
index
d89f83f
..
1cc706e
100644
(file)
--- a/
drivers/sbus/char/bbc_envctrl.c
+++ b/
drivers/sbus/char/bbc_envctrl.c
@@
-575,9
+575,9
@@
int bbc_envctrl_init(void)
int devidx = 0;
while ((echild = bbc_i2c_getdev(devidx++)) != NULL) {
int devidx = 0;
while ((echild = bbc_i2c_getdev(devidx++)) != NULL) {
- if (!strcmp(echild->prom_name, "temperature"))
+ if (!strcmp(echild->prom_n
ode->n
ame, "temperature"))
attach_one_temp(echild, temp_index++);
attach_one_temp(echild, temp_index++);
- if (!strcmp(echild->prom_name, "fan-control"))
+ if (!strcmp(echild->prom_n
ode->n
ame, "fan-control"))
attach_one_fan(echild, fan_index++);
}
if (temp_index != 0 && fan_index != 0) {
attach_one_fan(echild, fan_index++);
}
if (temp_index != 0 && fan_index != 0) {