---

yaml --- r: 254421 b: refs/heads/master c: 88f3b62 h: refs/heads/master i: 254419: 4ae58de v: v3
git-mirror · Jul 3, 2011 · 902c2fb · 902c2fb
1 parent 6d4b105
commit 902c2fb
Show file tree

Hide file tree

Showing 31 changed files with 2,330 additions and 2,763 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57f20f4ed6fb702339be2ef4dea9d15e6a7d0d07
+refs/heads/master: 88f3b62ac131e2549b6c262cacbd47e8cca42d6e
diff --git a/trunk/drivers/scsi/isci/Makefile b/trunk/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
diff --git a/trunk/drivers/scsi/isci/core/scic_remote_device.h b/trunk/drivers/scsi/isci/core/scic_remote_device.h
diff --git a/trunk/drivers/scsi/isci/core/scic_sds_controller.c b/trunk/drivers/scsi/isci/core/scic_sds_controller.c
@@ -57,13 +57,12 @@
 #include "scic_controller.h"
 #include "scic_phy.h"
 #include "scic_port.h"
-#include "scic_remote_device.h"
 #include "scic_sds_controller.h"
 #include "scu_registers.h"
 #include "scic_sds_phy.h"
 #include "scic_sds_port_configuration_agent.h"
 #include "scic_sds_port.h"
-#include "scic_sds_remote_device.h"
+#include "remote_device.h"
 #include "scic_sds_request.h"
 #include "sci_environment.h"
 #include "sci_util.h"

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_controller.h b/trunk/drivers/scsi/isci/core/scic_sds_controller.h
@@ -73,7 +73,7 @@
 #include "scic_config_parameters.h"
 #include "scic_sds_port.h"
 #include "scic_sds_phy.h"
-#include "scic_sds_remote_node_table.h"
+#include "remote_node_table.h"
 #include "scu_registers.h"
 #include "scu_constants.h"
 #include "scu_remote_node_context.h"

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_phy.c b/trunk/drivers/scsi/isci/core/scic_sds_phy.c
@@ -61,7 +61,7 @@
 #include "scic_sds_controller.h"
 #include "scic_sds_phy.h"
 #include "scic_sds_port.h"
-#include "scic_sds_remote_node_context.h"
+#include "remote_node_context.h"
 #include "sci_environment.h"
 #include "sci_util.h"
 #include "scu_event_codes.h"

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_port.c b/trunk/drivers/scsi/isci/core/scic_sds_port.c
@@ -60,8 +60,8 @@
 #include "scic_sds_controller.h"
 #include "scic_sds_phy.h"
 #include "scic_sds_port.h"
-#include "scic_sds_remote_device.h"
-#include "scic_sds_remote_node_context.h"
+#include "remote_device.h"
+#include "remote_node_context.h"
 #include "scic_sds_request.h"
 #include "sci_environment.h"
 #include "scu_registers.h"