---

yaml --- r: 254490 b: refs/heads/master c: 63a3a15 h: refs/heads/master v: v3
git-mirror · Jul 3, 2011 · a5eea64 · a5eea64
1 parent 68f8908
commit a5eea64
Show file tree

Hide file tree

Showing 18 changed files with 122 additions and 258 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc9203bf381a465cd115762b9cf7c9a313c874bc
+refs/heads/master: 63a3a15fb00ef49e50e98ff675094afcd92f113a
diff --git a/trunk/drivers/scsi/isci/Makefile b/trunk/drivers/scsi/isci/Makefile
@@ -5,13 +5,13 @@ isci-objs := init.o phy.o request.o sata.o \
 	     host.o task.o probe_roms.o \
 	     remote_node_context.o \
 	     remote_node_table.o \
+	     unsolicited_frame_control.o \
 	     core/scic_sds_request.o \
 	     core/scic_sds_stp_request.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_smp_request.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_sds_phy.h b/trunk/drivers/scsi/isci/core/scic_sds_phy.h
@@ -58,7 +58,7 @@
 
 #include "sas.h"
 #include "scic_phy.h"
-#include "scu_registers.h"
+#include "registers.h"
 #include "sci_base_state_machine.h"
 #include <scsi/libsas.h>
 

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_port.c b/trunk/drivers/scsi/isci/core/scic_sds_port.c
@@ -61,7 +61,7 @@
 #include "remote_device.h"
 #include "remote_node_context.h"
 #include "scic_sds_request.h"
-#include "scu_registers.h"
+#include "registers.h"
 #include "timers.h"
 
 #define SCIC_SDS_PORT_MIN_TIMER_COUNT  (SCI_MAX_PORTS)

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_port.h b/trunk/drivers/scsi/isci/core/scic_sds_port.h
@@ -59,7 +59,7 @@
 #include <linux/kernel.h>
 #include "isci.h"
 #include "sas.h"
-#include "scu_registers.h"
+#include "registers.h"
 #include "sci_base_state_machine.h"
 
 struct scic_sds_controller;

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_port_registers.h b/trunk/drivers/scsi/isci/core/scic_sds_port_registers.h
diff --git a/trunk/drivers/scsi/isci/core/scic_sds_request.c b/trunk/drivers/scsi/isci/core/scic_sds_request.c
@@ -55,13 +55,13 @@
 
 #include <scsi/sas.h>
 #include "scic_io_request.h"
-#include "scu_registers.h"
+#include "registers.h"
 #include "scic_sds_port.h"
 #include "remote_device.h"
 #include "scic_sds_request.h"
 #include "scic_sds_smp_request.h"
 #include "scic_sds_stp_request.h"
-#include "scic_sds_unsolicited_frame_control.h"
+#include "unsolicited_frame_control.h"
 #include "sci_util.h"
 #include "scu_completion_codes.h"
 #include "scu_task_context.h"

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_stp_request.c b/trunk/drivers/scsi/isci/core/scic_sds_stp_request.c
@@ -62,7 +62,7 @@
 #include "scic_sds_request.h"
 #include "scic_sds_stp_pio_request.h"
 #include "scic_sds_stp_request.h"
-#include "scic_sds_unsolicited_frame_control.h"
+#include "unsolicited_frame_control.h"
 #include "sci_util.h"
 #include "scu_completion_codes.h"
 #include "scu_event_codes.h"

diff --git a/trunk/drivers/scsi/isci/core/scu_viit_data.h b/trunk/drivers/scsi/isci/core/scu_viit_data.h
diff --git a/trunk/drivers/scsi/isci/host.c b/trunk/drivers/scsi/isci/host.c
@@ -66,7 +66,7 @@
 #include "sci_util.h"
 #include "scu_completion_codes.h"
 #include "scu_event_codes.h"
-#include "scu_registers.h"
+#include "registers.h"
 #include "scu_remote_node_context.h"
 #include "scu_task_context.h"
 #include "scu_unsolicited_frame.h"

diff --git a/trunk/drivers/scsi/isci/host.h b/trunk/drivers/scsi/isci/host.h
@@ -61,9 +61,9 @@
 #include "pool.h"
 #include "sci_base_state_machine.h"
 #include "remote_node_table.h"
-#include "scu_registers.h"
+#include "registers.h"
 #include "scu_unsolicited_frame.h"
-#include "scic_sds_unsolicited_frame_control.h"
+#include "unsolicited_frame_control.h"
 #include "scic_sds_port_configuration_agent.h"
 
 struct scic_sds_request;