diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/mtd/chips/map_absent.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/mtd/chips/map_absent.c')
| -rw-r--r-- | drivers/mtd/chips/map_absent.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c index a611de9b1515..ac01a949b687 100644 --- a/drivers/mtd/chips/map_absent.c +++ b/drivers/mtd/chips/map_absent.c | |||
| @@ -64,7 +64,8 @@ static struct mtd_info *map_absent_probe(struct map_info *map) | |||
| 64 | mtd->write = map_absent_write; | 64 | mtd->write = map_absent_write; |
| 65 | mtd->sync = map_absent_sync; | 65 | mtd->sync = map_absent_sync; |
| 66 | mtd->flags = 0; | 66 | mtd->flags = 0; |
| 67 | mtd->erasesize = PAGE_SIZE; | 67 | mtd->erasesize = PAGE_SIZE; |
| 68 | mtd->writesize = 1; | ||
| 68 | 69 | ||
| 69 | __module_get(THIS_MODULE); | 70 | __module_get(THIS_MODULE); |
| 70 | return mtd; | 71 | return mtd; |