Merge with /home/shaggy/git/linus-clean/

[linux-2.6-omap-h63xx.git] / drivers / block / aoe / aoechr.c

diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 45a243096187afed4746ca58b84584841b2373eb..41ae0ede619a84a9be5bef17844dd9dcfb647ca4 100644 (file)
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -224,7 +224,7 @@ aoechr_init(void)
                return PTR_ERR(aoe_class);
        }
        for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-               class_device_create(aoe_class,
+               class_device_create(aoe_class, NULL,
                                        MKDEV(AOE_MAJOR, chardevs[i].minor),
                                        NULL, chardevs[i].name);