diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
| commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
| tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/sbus | |
| parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
| parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers/sbus')
| -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. |