diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/mtd/devices/doc2001plus.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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) | |||
| 90 | return ret; | 90 | return ret; |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | /* For some reason the Millennium Plus seems to occassionally put itself | 93 | /* For some reason the Millennium Plus seems to occasionally put itself |
| 94 | * into reset mode. For me this happens randomly, with no pattern that I | 94 | * into reset mode. For me this happens randomly, with no pattern that I |
| 95 | * can detect. M-systems suggest always check this on any block level | 95 | * can detect. M-systems suggest always check this on any block level |
| 96 | * operation and setting to normal mode if in reset mode. | 96 | * operation and setting to normal mode if in reset mode. |