projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
drivers
/
sbus
/
char
/
bbc_envctrl.c
diff --git
a/drivers/sbus/char/bbc_envctrl.c
b/drivers/sbus/char/bbc_envctrl.c
index
d44205d
..
1cc706e
100644
(file)
--- a/
drivers/sbus/char/bbc_envctrl.c
+++ b/
drivers/sbus/char/bbc_envctrl.c
@@
-5,6
+5,7
@@
*/
#define __KERNEL_SYSCALLS__
*/
#define __KERNEL_SYSCALLS__
+static int errno;
#include <linux/kernel.h>
#include <linux/kthread.h>
#include <linux/kernel.h>
#include <linux/kthread.h>
@@
-13,8
+14,6
@@
#include <linux/delay.h>
#include <asm/oplib.h>
#include <asm/ebus.h>
#include <linux/delay.h>
#include <asm/oplib.h>
#include <asm/ebus.h>
-static int errno;
-#include <asm/unistd.h>
#include "bbc_i2c.h"
#include "max1617.h"
#include "bbc_i2c.h"
#include "max1617.h"
@@
-576,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) {