diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /drivers/mtd/mtdpart.c | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/mtd/mtdpart.c')
| -rw-r--r-- | drivers/mtd/mtdpart.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 1af989023c66..9c6236852942 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c | |||
| @@ -347,7 +347,6 @@ int add_mtd_partitions(struct mtd_info *master, | |||
| 347 | slave->mtd.subpage_sft = master->subpage_sft; | 347 | slave->mtd.subpage_sft = master->subpage_sft; |
| 348 | 348 | ||
| 349 | slave->mtd.name = parts[i].name; | 349 | slave->mtd.name = parts[i].name; |
| 350 | slave->mtd.bank_size = master->bank_size; | ||
| 351 | slave->mtd.owner = master->owner; | 350 | slave->mtd.owner = master->owner; |
| 352 | 351 | ||
| 353 | slave->mtd.read = part_read; | 352 | slave->mtd.read = part_read; |