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/mtd/ubi/scan.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/mtd/ubi/scan.c')
| -rw-r--r-- | drivers/mtd/ubi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index 11eb8ef12485..d2d12ab7def4 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c | |||
| @@ -968,7 +968,7 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si, | |||
| 968 | * contains garbage because of a power cut during erase | 968 | * contains garbage because of a power cut during erase |
| 969 | * operation. So we just schedule this PEB for erasure. | 969 | * operation. So we just schedule this PEB for erasure. |
| 970 | * | 970 | * |
| 971 | * Besides, in case of NOR flash, we deliberatly | 971 | * Besides, in case of NOR flash, we deliberately |
| 972 | * corrupt both headers because NOR flash erasure is | 972 | * corrupt both headers because NOR flash erasure is |
| 973 | * slow and can start from the end. | 973 | * slow and can start from the end. |
| 974 | */ | 974 | */ |