diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/sbus/char/envctrl.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/sbus/char/envctrl.c')
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index 58e583b61e60..aa2b60a868ba 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c | |||
| @@ -92,11 +92,11 @@ | |||
| 92 | #define ENVCTRL_CPUTEMP_MON 1 /* cpu temperature monitor */ | 92 | #define ENVCTRL_CPUTEMP_MON 1 /* cpu temperature monitor */ |
| 93 | #define ENVCTRL_CPUVOLTAGE_MON 2 /* voltage monitor */ | 93 | #define ENVCTRL_CPUVOLTAGE_MON 2 /* voltage monitor */ |
| 94 | #define ENVCTRL_FANSTAT_MON 3 /* fan status monitor */ | 94 | #define ENVCTRL_FANSTAT_MON 3 /* fan status monitor */ |
| 95 | #define ENVCTRL_ETHERTEMP_MON 4 /* ethernet temperarture */ | 95 | #define ENVCTRL_ETHERTEMP_MON 4 /* ethernet temperature */ |
| 96 | /* monitor */ | 96 | /* monitor */ |
| 97 | #define ENVCTRL_VOLTAGESTAT_MON 5 /* voltage status monitor */ | 97 | #define ENVCTRL_VOLTAGESTAT_MON 5 /* voltage status monitor */ |
| 98 | #define ENVCTRL_MTHRBDTEMP_MON 6 /* motherboard temperature */ | 98 | #define ENVCTRL_MTHRBDTEMP_MON 6 /* motherboard temperature */ |
| 99 | #define ENVCTRL_SCSITEMP_MON 7 /* scsi temperarture */ | 99 | #define ENVCTRL_SCSITEMP_MON 7 /* scsi temperature */ |
| 100 | #define ENVCTRL_GLOBALADDR_MON 8 /* global address */ | 100 | #define ENVCTRL_GLOBALADDR_MON 8 /* global address */ |
| 101 | 101 | ||
| 102 | /* Child device type. | 102 | /* Child device type. |