diff options
author | Tony Luck <tony.luck@intel.com> | 2005-08-30 20:30:09 +0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-08-30 20:30:09 +0400 |
commit | 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 (patch) | |
tree | eab3d229c7a527816db405299ce9603e538b521f /drivers/w1/w1_int.c | |
parent | e438befd76a5a743725a89365140a8a7bf276096 (diff) | |
parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
download | linux-288ceb8f142249109fd2e9f1bf0492bd6ff6d892.tar.xz |
Auto-update from upstream
Diffstat (limited to 'drivers/w1/w1_int.c')
-rw-r--r-- | drivers/w1/w1_int.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index b5a5e04b6d37..498ad505fa5f 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -86,9 +86,9 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, dev->driver = driver; - dev->groups = 23; + dev->groups = 1; dev->seq = 1; - dev->nls = netlink_kernel_create(NETLINK_W1, NULL); + dev->nls = netlink_kernel_create(NETLINK_W1, 1, NULL, THIS_MODULE); if (!dev->nls) { printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n", NETLINK_NFLOG, dev->dev.bus_id); @@ -225,3 +225,5 @@ void w1_remove_master_device(struct w1_bus_master *bm) EXPORT_SYMBOL(w1_add_master_device); EXPORT_SYMBOL(w1_remove_master_device); + +MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_W1); |