diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /drivers/mtd/chips/map_ram.c | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/mtd/chips/map_ram.c')
| -rw-r--r-- | drivers/mtd/chips/map_ram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c index bd2e876a814..763925747db 100644 --- a/drivers/mtd/chips/map_ram.c +++ b/drivers/mtd/chips/map_ram.c | |||
| @@ -70,7 +70,7 @@ static struct mtd_info *map_ram_probe(struct map_info *map) | |||
| 70 | mtd->read = mapram_read; | 70 | mtd->read = mapram_read; |
| 71 | mtd->write = mapram_write; | 71 | mtd->write = mapram_write; |
| 72 | mtd->sync = mapram_nop; | 72 | mtd->sync = mapram_nop; |
| 73 | mtd->flags = MTD_CAP_RAM | MTD_VOLATILE; | 73 | mtd->flags = MTD_CAP_RAM; |
| 74 | 74 | ||
| 75 | mtd->erasesize = PAGE_SIZE; | 75 | mtd->erasesize = PAGE_SIZE; |
| 76 | while(mtd->size & (mtd->erasesize - 1)) | 76 | while(mtd->size & (mtd->erasesize - 1)) |