diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-26 16:55:10 +0200 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-26 16:55:10 +0200 |
| commit | de8fd087b280797977b012a4275ee53ff2999f3f (patch) | |
| tree | 5cd65289983ad65812a6a4335fe657eeb125a7f0 /drivers/w1/w1_int.c | |
| parent | JFS: Fix i_blocks accounting when allocation fails (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-de8fd087b280797977b012a4275ee53ff2999f3f.tar.xz linux-de8fd087b280797977b012a4275ee53ff2999f3f.zip | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/w1/w1_int.c')
| -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 35e85d961702..b5a5e04b6d37 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); |