diff options
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 @@ | |||
29 | 29 | ||
30 | static u32 w1_ids = 1; | 30 | static u32 w1_ids = 1; |
31 | 31 | ||
32 | extern struct device_driver w1_driver; | 32 | extern struct device_driver w1_master_driver; |
33 | extern struct bus_type w1_bus_type; | 33 | extern struct bus_type w1_bus_type; |
34 | extern struct device w1_device; | 34 | extern struct device w1_master_device; |
35 | extern int w1_max_slave_count; | 35 | extern int w1_max_slave_count; |
36 | extern int w1_max_slave_ttl; | 36 | extern int w1_max_slave_ttl; |
37 | extern struct list_head w1_masters; | 37 | extern struct list_head w1_masters; |
@@ -125,7 +125,7 @@ int w1_add_master_device(struct w1_bus_master *master) | |||
125 | return(-EINVAL); | 125 | return(-EINVAL); |
126 | } | 126 | } |
127 | 127 | ||
128 | dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &w1_driver, &w1_device); | 128 | dev = w1_alloc_dev(w1_ids++, w1_max_slave_count, w1_max_slave_ttl, &w1_master_driver, &w1_master_device); |
129 | if (!dev) | 129 | if (!dev) |
130 | return -ENOMEM; | 130 | return -ENOMEM; |
131 | 131 | ||