From b3574f12a62c0ce624476d5796243b3a2cbfdc83 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 8 May 2009 16:35:37 -0400 Subject: [PATCH] --- yaml --- r: 148027 b: refs/heads/master c: 2ad52f473bbc1aa5b33c4a329b8a359f125e19d1 h: refs/heads/master i: 148025: d11a317bfc2cffa4c89f862df0888af08c9dfcb1 148023: 62ffd68d73d203ae3be6ad570b784c4e026bab4b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/Kconfig | 11 +----- trunk/drivers/scsi/Makefile | 2 +- trunk/drivers/scsi/mvsas/Kconfig | 35 +++++++++++++++++++ trunk/drivers/scsi/mvsas/Makefile | 26 ++++++++++++++ .../drivers/scsi/{mvsas.c => mvsas/mv_sas.c} | 0 6 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 trunk/drivers/scsi/mvsas/Kconfig create mode 100644 trunk/drivers/scsi/mvsas/Makefile rename trunk/drivers/scsi/{mvsas.c => mvsas/mv_sas.c} (100%) diff --git a/[refs] b/[refs] index 124b6991c8d6..0474c82d0501 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a03706017e443ced6e354d434142989c9e8653d7 +refs/heads/master: 2ad52f473bbc1aa5b33c4a329b8a359f125e19d1 diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig index fb2740789b68..6e8106a70b3d 100644 --- a/trunk/drivers/scsi/Kconfig +++ b/trunk/drivers/scsi/Kconfig @@ -508,6 +508,7 @@ config SCSI_AIC7XXX_OLD source "drivers/scsi/aic7xxx/Kconfig.aic79xx" source "drivers/scsi/aic94xx/Kconfig" +source "drivers/scsi/mvsas/Kconfig" config SCSI_DPT_I2O tristate "Adaptec I2O RAID support " @@ -1050,16 +1051,6 @@ config SCSI_IZIP_SLOW_CTR Generally, saying N is fine. -config SCSI_MVSAS - tristate "Marvell 88SE6440 SAS/SATA support" - depends on PCI && SCSI - select SCSI_SAS_LIBSAS - help - This driver supports Marvell SAS/SATA PCI devices. - - To compiler this driver as a module, choose M here: the module - will be called mvsas. - config SCSI_NCR53C406A tristate "NCR53c406a SCSI support" depends on ISA && SCSI diff --git a/trunk/drivers/scsi/Makefile b/trunk/drivers/scsi/Makefile index a5049cfb40ed..8795c309963e 100644 --- a/trunk/drivers/scsi/Makefile +++ b/trunk/drivers/scsi/Makefile @@ -126,7 +126,7 @@ obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvscsi/ obj-$(CONFIG_SCSI_IBMVFC) += ibmvscsi/ obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o obj-$(CONFIG_SCSI_STEX) += stex.o -obj-$(CONFIG_SCSI_MVSAS) += mvsas.o +obj-$(CONFIG_SCSI_MVSAS) += mvsas/ obj-$(CONFIG_PS3_ROM) += ps3rom.o obj-$(CONFIG_SCSI_CXGB3_ISCSI) += libiscsi.o libiscsi_tcp.o cxgb3i/ diff --git a/trunk/drivers/scsi/mvsas/Kconfig b/trunk/drivers/scsi/mvsas/Kconfig new file mode 100644 index 000000000000..f83f368e6902 --- /dev/null +++ b/trunk/drivers/scsi/mvsas/Kconfig @@ -0,0 +1,35 @@ +# +# Kernel configuration file for 88SE64XX SAS/SATA driver. +# +# Copyright 2007 Red Hat, Inc. +# Copyright 2008 Marvell. +# +# This file is licensed under GPLv2. +# +# This file is part of the 88SE64XX driver. +# +# The 88SE64XX driver is free software; you can redistribute +# it and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; version 2 of the +# License. +# +# The 88SE64XX driver is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with 88SE64XX Driver; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# + +config SCSI_MVSAS + tristate "Marvell 88SE64XX SAS/SATA support" + depends on PCI + select SCSI_SAS_LIBSAS + select FW_LOADER + help + This driver supports Marvell's SAS/SATA 3Gb/s PCI-E 88SE64XX + chip based host adapters. + diff --git a/trunk/drivers/scsi/mvsas/Makefile b/trunk/drivers/scsi/mvsas/Makefile new file mode 100644 index 000000000000..1ac6ed955a04 --- /dev/null +++ b/trunk/drivers/scsi/mvsas/Makefile @@ -0,0 +1,26 @@ +# +# Makefile for Marvell 88SE64xx SAS/SATA driver. +# +# Copyright 2007 Red Hat, Inc. +# Copyright 2008 Marvell. +# +# This file is licensed under GPLv2. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 of the +# License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +obj-$(CONFIG_SCSI_MVSAS) += mvsas.o +mvsas-y += mv_sas.o + diff --git a/trunk/drivers/scsi/mvsas.c b/trunk/drivers/scsi/mvsas/mv_sas.c similarity index 100% rename from trunk/drivers/scsi/mvsas.c rename to trunk/drivers/scsi/mvsas/mv_sas.c