diff --git a/[refs] b/[refs] index ba2576151827..f0098e3caec9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78cde0887930f5d11a56fc51b013f2672fba0e6f +refs/heads/master: ebf644c4623bc3eb57683199cd2b9080028b0f6f diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c index 55473371b7c6..e67eef4867ba 100644 --- a/trunk/drivers/char/mem.c +++ b/trunk/drivers/char/mem.c @@ -980,10 +980,10 @@ static int __init chr_dev_init(void) mem_class = class_create(THIS_MODULE, "mem"); for (i = 0; i < ARRAY_SIZE(devlist); i++) - class_device_create(mem_class, NULL, - MKDEV(MEM_MAJOR, devlist[i].minor), - NULL, devlist[i].name); - + device_create(mem_class, NULL, + MKDEV(MEM_MAJOR, devlist[i].minor), + devlist[i].name); + return 0; }