diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
| commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
| tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /drivers/mtd/mtdchar.c | |
| parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/mtdchar.c')
| -rw-r--r-- | drivers/mtd/mtdchar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index 1ed602a0f24c..c534fd5d95cb 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c | |||
| @@ -24,10 +24,10 @@ static void mtd_notify_add(struct mtd_info* mtd) | |||
| 24 | if (!mtd) | 24 | if (!mtd) |
| 25 | return; | 25 | return; |
| 26 | 26 | ||
| 27 | class_device_create(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2), | 27 | class_device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2), |
| 28 | NULL, "mtd%d", mtd->index); | 28 | NULL, "mtd%d", mtd->index); |
| 29 | 29 | ||
| 30 | class_device_create(mtd_class, | 30 | class_device_create(mtd_class, NULL, |
| 31 | MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1), | 31 | MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1), |
| 32 | NULL, "mtd%dro", mtd->index); | 32 | NULL, "mtd%dro", mtd->index); |
| 33 | } | 33 | } |