From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030349AbWFVSd4 (ORCPT ); Thu, 22 Jun 2006 14:33:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161166AbWFVSbL (ORCPT ); Thu, 22 Jun 2006 14:31:11 -0400 Received: from mx1.suse.de ([195.135.220.2]:9098 "EHLO mx1.suse.de") by vger.kernel.org with ESMTP id S1030357AbWFVSbE (ORCPT ); Thu, 22 Jun 2006 14:31:04 -0400 From: Greg KH To: linux-kernel@vger.kernel.org Cc: Adrian Bunk , Andrew Morton , Greg Kroah-Hartman Subject: [PATCH 12/14] [PATCH] drivers/w1/w1.c: fix a compile error Reply-To: Greg KH Date: Thu, 22 Jun 2006 11:27:16 -0700 Message-Id: <11510008791727-git-send-email-greg@kroah.com> X-Mailer: git-send-email 1.4.0 In-Reply-To: <1151000876534-git-send-email-greg@kroah.com> References: <20060622182645.GB5668@kroah.com> <11510008381000-git-send-email-greg@kroah.com> <11510008413045-git-send-email-greg@kroah.com> <11510008461301-git-send-email-greg@kroah.com> <11510008522327-git-send-email-greg@kroah.com> <11510008553417-git-send-email-greg@kroah.com> <11510008583492-git-send-email-greg@kroah.com> <11510008623474-git-send-email-greg@kroah.com> <11510008662311-git-send-email-greg@kroah.com> <11510008691087-git-send-email-greg@kroah.com> <1151000872615-git-send-email-greg@kroah.com> <1151000876534-git-send-email-greg@kroah.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Adrian Bunk From: Adrian Bunk 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 Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- 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 c90a928..f1df534 100644 --- a/drivers/w1/w1.h +++ b/drivers/w1/w1.h @@ -211,7 +211,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; -- 1.4.0