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/char/mem.c | |
| parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index f182752fe918..38be4b0dbd1c 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
| @@ -920,7 +920,8 @@ static int __init chr_dev_init(void) | |||
| 920 | 920 | ||
| 921 | mem_class = class_create(THIS_MODULE, "mem"); | 921 | mem_class = class_create(THIS_MODULE, "mem"); |
| 922 | for (i = 0; i < ARRAY_SIZE(devlist); i++) { | 922 | for (i = 0; i < ARRAY_SIZE(devlist); i++) { |
| 923 | class_device_create(mem_class, MKDEV(MEM_MAJOR, devlist[i].minor), | 923 | class_device_create(mem_class, NULL, |
| 924 | MKDEV(MEM_MAJOR, devlist[i].minor), | ||
| 924 | NULL, devlist[i].name); | 925 | NULL, devlist[i].name); |
| 925 | devfs_mk_cdev(MKDEV(MEM_MAJOR, devlist[i].minor), | 926 | devfs_mk_cdev(MKDEV(MEM_MAJOR, devlist[i].minor), |
| 926 | S_IFCHR | devlist[i].mode, devlist[i].name); | 927 | S_IFCHR | devlist[i].mode, devlist[i].name); |