From: Adrian Bunk <bunk@stusta.de>
Date: Thu, 27 Apr 2006 09:29:18 +0000 (-0700)
Subject: [PATCH] drivers/w1/w1.c: fix a compile error
X-Git-Tag: v2.6.18-rc1~1081^2~227^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a873403d387c34c4466cc81649acc8acd66874d;p=linux-2.6

[PATCH] drivers/w1/w1.c: fix a compile error

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>
---

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index c90a92879b..f1df5343f4 100644
--- 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;