Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[cascardo/linux.git] / drivers / w1 / w1.h

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index c90a928..f1df534 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -211,7 +211,6 @@ static inline struct w1_master* dev_to_w1_master(struct device *dev)
 }
 
 extern struct device_driver w1_master_driver;
-extern struct bus_type w1_bus_type;
 extern struct device w1_master_device;
 extern int w1_max_slave_count;
 extern int w1_max_slave_ttl;