isci: uplevel state machine

unify core/sci_base_state.h and core/sci_base_state_machine.[ch] into
state_machine.[ch]

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/scsi/isci/Makefile b/drivers/scsi/isci/Makefile
index 0153b0fe13b8..cfc640f9dc3f 100644
--- a/drivers/scsi/isci/Makefile
+++ b/drivers/scsi/isci/Makefile
@@ -3,6 +3,7 @@ obj-$(CONFIG_SCSI_ISCI) += isci.o
 isci-objs := init.o phy.o request.o sata.o \
              remote_device.o port.o timers.o \
              host.o task.o probe_roms.o \
+             state_machine.o \
              remote_node_context.o \
              remote_node_table.o \
              unsolicited_frame_control.o \
@@ -13,5 +14,4 @@ isci-objs := init.o phy.o request.o sata.o \
              core/scic_sds_phy.o \
              core/scic_sds_ssp_request.o \
              core/scic_sds_smp_request.o \
-             core/sci_base_state_machine.o \
              core/sci_util.o