diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/sbus/char/jsflash.c | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/sbus/char/jsflash.c')
-rw-r--r-- | drivers/sbus/char/jsflash.c | 2 |
1 files changed, 1 insertions, 1 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 | * |