Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 4a80b2f864e0b6e5edc468bc33342b4ffd612c3e..45758d5b56ef88f3c2700fb218b55d6b71994b90 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -4778,9 +4778,8 @@ static int __init stallion_module_init(void)
        if (IS_ERR(stallion_class))
                printk("STALLION: failed to create class\n");
        for (i = 0; i < 4; i++)
-               class_device_create(stallion_class, NULL,
-                                   MKDEV(STL_SIOMEMMAJOR, i), NULL,
-                                   "staliomem%d", i);
+               device_create(stallion_class, NULL, MKDEV(STL_SIOMEMMAJOR, i),
+                             "staliomem%d", i);
 
        return 0;
 err_unrtty:
@@ -4816,7 +4815,7 @@ static void __exit stallion_module_exit(void)
        }
 
        for (i = 0; i < 4; i++)
-               class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
+               device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
        unregister_chrdev(STL_SIOMEMMAJOR, "staliomem");
        class_destroy(stallion_class);