diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/sbus | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/jsflash.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/max1617.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index e8566224fe4b..6b4678a7900a 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * TODO: Erase/program both banks of a 8MB SIMM. | 13 | * TODO: Erase/program both banks of a 8MB SIMM. |
| 14 | * | 14 | * |
| 15 | * It is anticipated that programming an OS Flash will be a routine | 15 | * It is anticipated that programming an OS Flash will be a routine |
| 16 | * procedure. In the same time it is exeedingly dangerous because | 16 | * procedure. In the same time it is exceedingly dangerous because |
| 17 | * a user can program its OBP flash with OS image and effectively | 17 | * a user can program its OBP flash with OS image and effectively |
| 18 | * kill the machine. | 18 | * kill the machine. |
| 19 | * | 19 | * |
diff --git a/drivers/sbus/char/max1617.h b/drivers/sbus/char/max1617.h index 0bb09c286cb4..cd30819a0a30 100644 --- a/drivers/sbus/char/max1617.h +++ b/drivers/sbus/char/max1617.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #define MAX1617_CPU_TEMP 0x01 /* Processor die temp in C */ | 6 | #define MAX1617_CPU_TEMP 0x01 /* Processor die temp in C */ |
| 7 | #define MAX1617_STATUS 0x02 /* Chip status bits */ | 7 | #define MAX1617_STATUS 0x02 /* Chip status bits */ |
| 8 | 8 | ||
| 9 | /* Read-only versions of changable registers. */ | 9 | /* Read-only versions of changeable registers. */ |
| 10 | #define MAX1617_RD_CFG_BYTE 0x03 /* Config register */ | 10 | #define MAX1617_RD_CFG_BYTE 0x03 /* Config register */ |
| 11 | #define MAX1617_RD_CVRATE_BYTE 0x04 /* Temp conversion rate */ | 11 | #define MAX1617_RD_CVRATE_BYTE 0x04 /* Temp conversion rate */ |
| 12 | #define MAX1617_RD_AMB_HIGHLIM 0x05 /* Ambient high limit */ | 12 | #define MAX1617_RD_AMB_HIGHLIM 0x05 /* Ambient high limit */ |