Skip to content

Commit

Permalink
[SCSI] mvsas: move into new directory drivers/scsi/mvsas/
Browse files Browse the repository at this point in the history
Zero functional changes, just file movement.

This commit prepares for the upcoming integration of the
Marvell-provided driver update that splits the driver into support
for both 64xx and 94xx chip families.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
Jeff Garzik authored and James Bottomley committed May 20, 2009
1 parent a037060 commit 2ad52f4
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 11 deletions.
11 changes: 1 addition & 10 deletions drivers/scsi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
35 changes: 35 additions & 0 deletions drivers/scsi/mvsas/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#
# Kernel configuration file for 88SE64XX SAS/SATA driver.
#
# Copyright 2007 Red Hat, Inc.
# Copyright 2008 Marvell. <kewei@marvell.com>
#
# 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.

26 changes: 26 additions & 0 deletions drivers/scsi/mvsas/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#
# Makefile for Marvell 88SE64xx SAS/SATA driver.
#
# Copyright 2007 Red Hat, Inc.
# Copyright 2008 Marvell. <kewei@marvell.com>
#
# 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

File renamed without changes.

0 comments on commit 2ad52f4

Please sign in to comment.