diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/mtd/devices/pmc551.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/mtd/devices/pmc551.c')
| -rw-r--r-- | drivers/mtd/devices/pmc551.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c index 666cce1bf60c..f620d74f1004 100644 --- a/drivers/mtd/devices/pmc551.c +++ b/drivers/mtd/devices/pmc551.c | |||
| @@ -778,7 +778,8 @@ static int __init init_pmc551(void) | |||
| 778 | mtd->type = MTD_RAM; | 778 | mtd->type = MTD_RAM; |
| 779 | mtd->name = "PMC551 RAM board"; | 779 | mtd->name = "PMC551 RAM board"; |
| 780 | mtd->erasesize = 0x10000; | 780 | mtd->erasesize = 0x10000; |
| 781 | mtd->owner = THIS_MODULE; | 781 | mtd->writesize = 1; |
| 782 | mtd->owner = THIS_MODULE; | ||
| 782 | 783 | ||
| 783 | if (add_mtd_device(mtd)) { | 784 | if (add_mtd_device(mtd)) { |
| 784 | printk(KERN_NOTICE "pmc551: Failed to register new device\n"); | 785 | printk(KERN_NOTICE "pmc551: Failed to register new device\n"); |