From: Adrian Bunk <bunk@stusta.de>

drivers/w1/w1.c:197: error: static declaration of 'w1_bus_type' follows non-static declaration
drivers/w1/w1.h:217: error: previous declaration of 'w1_bus_type' was here

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/w1/w1.h |    1 -
 1 files changed, 1 deletion(-)

diff -puN drivers/w1/w1.h~gregkh-i2c-w1-cleanups-fix drivers/w1/w1.h
--- devel/drivers/w1/w1.h~gregkh-i2c-w1-cleanups-fix	2006-04-09 21:43:43.000000000 -0700
+++ devel-akpm/drivers/w1/w1.h	2006-04-09 21:43:43.000000000 -0700
@@ -214,7 +214,6 @@ static inline struct w1_master* dev_to_w
 }
 
 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;
_