diff options
author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2005-08-11 13:20:07 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-08 14:41:26 -0700 |
commit | 7f772ed8df27c6941952452330c618512389c4c7 (patch) | |
tree | 6ad8320e0ee8bd2f4709176381662460ec4b1e45 /drivers/w1/w1_int.c | |
parent | 8949d2aa05ddf5e9a31d738568a79915970cb38e (diff) | |
download | linux-stable-7f772ed8df27c6941952452330c618512389c4c7.tar.gz linux-stable-7f772ed8df27c6941952452330c618512389c4c7.tar.bz2 linux-stable-7f772ed8df27c6941952452330c618512389c4c7.zip |
[PATCH] w1: hotplug support.
Here is W1 hotplug in addition to netlink notifications.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/w1/w1_int.c')
-rw-r--r-- | drivers/w1/w1_int.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 2a538d012194..c13724fd0971 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -29,9 +29,9 @@ static u32 w1_ids = 1; -extern struct device_driver w1_driver; +extern struct device_driver w1_master_driver; extern struct bus_type w1_bus_type; -extern struct device w1_device; +extern struct device w1_master_device; extern int w1_max_slave_count; extern int w1_max_slave_ttl; extern struct list_head w1_masters; @@ -125,7 +125,7 @@ int w1_add_master_device(struct w1_bus_master *master) return(-EINVAL); } - dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &w1_driver, &w1_device); + dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &w1_master_driver, &w1_master_device); if (!dev) return -ENOMEM; |