aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/Makefile
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-07-01 13:52:55 -0400
committerDan Williams <dan.j.williams@intel.com>2011-07-03 07:04:52 -0400
commit16ba77091b44af28b3ff3318b4a2aa4fbf7d4c24 (patch)
tree56c26a8e32991670acbeaffbcba3c41822e7911a /drivers/scsi/isci/Makefile
parent34a991587a5cc9f78960c2c9beea217866458c41 (diff)
isci: merge sata.[ch] into request.c
Undo some needless separation. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/Makefile')
-rw-r--r--drivers/scsi/isci/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/Makefile b/drivers/scsi/isci/Makefile
index 42449701ad9..3359e10e0d8 100644
--- a/drivers/scsi/isci/Makefile
+++ b/drivers/scsi/isci/Makefile
@@ -1,5 +1,5 @@
1obj-$(CONFIG_SCSI_ISCI) += isci.o 1obj-$(CONFIG_SCSI_ISCI) += isci.o
2isci-objs := init.o phy.o request.o sata.o \ 2isci-objs := init.o phy.o request.o \
3 remote_device.o port.o \ 3 remote_device.o port.o \
4 host.o task.o probe_roms.o \ 4 host.o task.o probe_roms.o \
5 remote_node_context.o \ 5 remote_node_context.o \