diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-25 03:39:30 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-25 03:39:30 (GMT) |
commit | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (patch) | |
tree | 24122979b411dcec6ff390fc9ae84ad9413128e9 /drivers | |
parent | e89227889cec6b66758b44c83f78dba337e5d699 (diff) | |
parent | 7686ee1ad976efeddf10583f013462c66408ae51 (diff) | |
download | linux-fsl-qoriq-6b6a93c6876ea1c530d5d3f68e3678093a27fab0.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/w1/w1_int.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 35e85d9..b5a5e04 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -88,7 +88,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, dev->groups = 23; dev->seq = 1; - dev->nls = netlink_kernel_create(NETLINK_NFLOG, NULL); + dev->nls = netlink_kernel_create(NETLINK_W1, NULL); if (!dev->nls) { printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n", NETLINK_NFLOG, dev->dev.bus_id); |