[PATCH] drivers/w1/w1.c: fix a compile error
authorAdrian Bunk <bunk@stusta.de>
Thu, 27 Apr 2006 09:29:18 +0000 (02:29 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 22 Jun 2006 18:22:51 +0000 (11:22 -0700)
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/w1/w1.h

index c90a92879bc72eea29533bb01573c66705be9dd7..f1df5343f4ad4a25ab87f7c1782216f1135eec33 100644 (file)
@@ -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 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;
 extern struct device w1_master_device;
 extern int w1_max_slave_count;
 extern int w1_max_slave_ttl;