diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-19 09:55:58 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-19 09:56:17 +0400 |
| commit | 68d2cf25d39324c54b5e42de7915c623a0917abe (patch) | |
| tree | ff1291450d7e6630bc77ec1363c3db8d74fa58b0 /drivers/mtd/devices/doc2001plus.c | |
| parent | 176fcc5c5f0131504a55e1e1d35389c49a9177c2 (diff) | |
| parent | 5d2cd90922c778908bd0cd669e572a5b5eafd737 (diff) | |
| download | linux-68d2cf25d39324c54b5e42de7915c623a0917abe.tar.xz | |
Merge branch 'perf/urgent' into perf/core
Merge reason: we'll be queueing up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/mtd/devices/doc2001plus.c')
| -rw-r--r-- | drivers/mtd/devices/doc2001plus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c index 719b2915dc3a..8b36fa77a195 100644 --- a/drivers/mtd/devices/doc2001plus.c +++ b/drivers/mtd/devices/doc2001plus.c @@ -90,7 +90,7 @@ static inline int DoC_WaitReady(void __iomem * docptr) return ret; } -/* For some reason the Millennium Plus seems to occassionally put itself +/* For some reason the Millennium Plus seems to occasionally put itself * into reset mode. For me this happens randomly, with no pattern that I * can detect. M-systems suggest always check this on any block level * operation and setting to normal mode if in reset mode. |