Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / lib / kobject_uevent.c

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 84272ed77f039c55de62be540ac19d23189cc06f..82fc1794b69113ab09266b2ca26534c194418e83 100644 (file)
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -293,7 +293,7 @@ EXPORT_SYMBOL_GPL(add_uevent_var);
 static int __init kobject_uevent_init(void)
 {
        uevent_sock = netlink_kernel_create(NETLINK_KOBJECT_UEVENT, 1, NULL,
-                                           THIS_MODULE);
+                                           NULL, THIS_MODULE);
 
        if (!uevent_sock) {
                printk(KERN_ERR