summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-03 15:00:11 -0700
committerJames Bottomley <JBottomley@Parallels.com>2013-09-06 11:42:53 -0700
commit9807b4d94911be4e4efb9a08481b24292a9edf8a (patch)
tree6fdb6d58e0421d703abcf2c984d0ae8b92d2a218 /drivers/scsi
parentc281e32aeea4af061264fd18843dc15984482fec (diff)
downloadlinux-9807b4d94911be4e4efb9a08481b24292a9edf8a.tar.bz2
[SCSI] Allow MPT Fusion SAS 3.0 driver to be built into the kernel
Right now the Makefile for the mpt3sas driver does not even allow the driver to be built into the kernel. So fix that up, as there doesn't seem to be any obvious reason why this shouldn't be done. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Sreekanth Reddy <Sreekanth.Reddy@lsi.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/mpt3sas/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/Makefile b/drivers/scsi/mpt3sas/Makefile
index 4c1d2e7a1176..efb0c4c2e310 100644
--- a/drivers/scsi/mpt3sas/Makefile
+++ b/drivers/scsi/mpt3sas/Makefile
@@ -1,5 +1,5 @@
# mpt3sas makefile
-obj-m += mpt3sas.o
+obj-$(CONFIG_SCSI_MPT3SAS) += mpt3sas.o
mpt3sas-y += mpt3sas_base.o \
mpt3sas_config.o \
mpt3sas_scsih.o \