diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /drivers/mtd/mtdblock_ro.c | |
parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mtd/mtdblock_ro.c')
-rw-r--r-- | drivers/mtd/mtdblock_ro.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c index 0c830ba41ef0..29563ed258a4 100644 --- a/drivers/mtd/mtdblock_ro.c +++ b/drivers/mtd/mtdblock_ro.c | |||
@@ -45,9 +45,7 @@ static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) | |||
45 | dev->blksize = 512; | 45 | dev->blksize = 512; |
46 | dev->size = mtd->size >> 9; | 46 | dev->size = mtd->size >> 9; |
47 | dev->tr = tr; | 47 | dev->tr = tr; |
48 | if ((mtd->flags & (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEABLE)) != | 48 | dev->readonly = 1; |
49 | (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEABLE)) | ||
50 | dev->readonly = 1; | ||
51 | 49 | ||
52 | add_mtd_blktrans_dev(dev); | 50 | add_mtd_blktrans_dev(dev); |
53 | } | 51 | } |