diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-04-27 11:29:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-22 20:22:51 +0200 |
| commit | 6a873403d387c34c4466cc81649acc8acd66874d (patch) | |
| tree | 1b449b00ef736ede8e07481909d2e333c126a01b /drivers/w1/w1.h | |
| parent | [PATCH] W1: fix dependencies of W1_SLAVE_DS2433_CRC (diff) | |
| download | linux-6a873403d387c34c4466cc81649acc8acd66874d.tar.xz linux-6a873403d387c34c4466cc81649acc8acd66874d.zip | |
[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>
Diffstat (limited to 'drivers/w1/w1.h')
| -rw-r--r-- | drivers/w1/w1.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h index c90a92879bc7..f1df5343f4ad 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; |