From patchwork Wed Sep 15 19:57:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 64895 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AEAECB6F10 for ; Thu, 16 Sep 2010 05:58:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753649Ab0IOT6v (ORCPT ); Wed, 15 Sep 2010 15:58:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20412 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753203Ab0IOT6v (ORCPT ); Wed, 15 Sep 2010 15:58:51 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8FJwAqB032302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 15 Sep 2010 15:58:10 -0400 Received: from cavan.codon.org.uk ([10.3.113.16]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8FJw67G016675 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Wed, 15 Sep 2010 15:58:07 -0400 Received: from nat-pool-rdu.redhat.com ([66.187.233.202] helo=localhost.localdomain) by cavan.codon.org.uk with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Ovy7G-0008EE-SQ; Wed, 15 Sep 2010 20:58:03 +0100 From: Matthew Garrett To: linux-acpi@vger.kernel.org Cc: linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, lenb@kernel.org, James.Bottomley@suse.de, jgarzik@pobox.com, Matthew Garrett Subject: [PATCH 1/5] scsi: Export scsi_bus_type Date: Wed, 15 Sep 2010 15:57:59 -0400 Message-Id: <1284580683-2386-1-git-send-email-mjg@redhat.com> X-SA-Do-Not-Run: Yes X-SA-Exim-Connect-IP: 66.187.233.202 X-SA-Exim-Mail-From: mjg@redhat.com X-SA-Exim-Scanned: No (on cavan.codon.org.uk); SAEximRunCond expanded to false X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org We need scsi_bus_type in order to be able to bind ata devices against acpi devices. Export it from the scsi core. Signed-off-by: Matthew Garrett --- drivers/scsi/scsi_priv.h | 1 - include/scsi/scsi.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index b4056d1..ff1e284 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -132,7 +132,6 @@ extern int scsi_sysfs_target_initialize(struct scsi_device *); extern struct scsi_transport_template blank_transport_template; extern void __scsi_remove_device(struct scsi_device *); -extern struct bus_type scsi_bus_type; extern const struct attribute_group *scsi_sysfs_shost_attr_groups[]; /* scsi_netlink.c */ diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 8fcb6e0..6eb0c90 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -149,6 +149,8 @@ struct scsi_cmnd; #define SCSI_MAX_VARLEN_CDB_SIZE 260 +extern struct bus_type scsi_bus_type; + /* defined in T10 SCSI Primary Commands-2 (SPC2) */ struct scsi_varlen_cdb_hdr { __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */