Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / drivers / char / istallion.c

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 9c19e5435a11faaa33df2a40a39ef2f7a4d06553..e3ddbdb85a2f3d4d6addf22ddc360cfbafa57299 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -5246,7 +5246,8 @@ int __init stli_init(void)
                devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
                               S_IFCHR | S_IRUSR | S_IWUSR,
                               "staliomem/%d", i);
-               class_device_create(istallion_class, MKDEV(STL_SIOMEMMAJOR, i),
+               class_device_create(istallion_class, NULL,
+                               MKDEV(STL_SIOMEMMAJOR, i),
                                NULL, "staliomem%d", i);
        }