isci: move remote_device handling out of the core

Now that the core/lldd remote_device data structures are nominally unified
merge the corresponding sources into the top-level directory.  Also move the
remote_node_context infrastructure which has no analog at the lldd level.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/scsi/isci/Makefile b/drivers/scsi/isci/Makefile
index 522e7a7c062e..ccc8c53f501d 100644
--- a/drivers/scsi/isci/Makefile
+++ b/drivers/scsi/isci/Makefile
@@ -10,20 +10,19 @@ 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 \
+             stp_remote_device.o \
+             smp_remote_device.o \
+             remote_node_context.o \
+             remote_node_table.o \
              core/scic_sds_controller.o  \
-             core/scic_sds_remote_device.o    \
              core/scic_sds_request.o \
              core/scic_sds_stp_request.o \
              core/scic_sds_stp_packet_request.o \
-             core/scic_sds_stp_remote_device.o \
              core/scic_sds_port.o \
              core/scic_sds_port_configuration_agent.o \
              core/scic_sds_phy.o \
              core/scic_sds_ssp_request.o \
-             core/scic_sds_remote_node_context.o \
              core/scic_sds_smp_request.o \
-             core/scic_sds_smp_remote_device.o \
-             core/scic_sds_remote_node_table.o \
              core/scic_sds_unsolicited_frame_control.o \
              core/sci_base_state_machine.o \
              core/sci_util.o