---

yaml --- r: 254458 b: refs/heads/master c: d6f6404 h: refs/heads/master v: v3
git-mirror · Jul 3, 2011 · ef1fb71 · ef1fb71
1 parent 0c44b47
commit ef1fb71
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 971cc2ff90875a4ca28b7da5b91a408cc8151fdc
+refs/heads/master: d6f6404c038b004fdb93f0676db934d69c524f7e
diff --git a/trunk/drivers/scsi/isci/Makefile b/trunk/drivers/scsi/isci/Makefile
@@ -1,7 +1,3 @@
-#TODO kill SCIC_SDS_4_ENABLED it is always true for this
-#generation of silicon
-EXTRA_CFLAGS += -DSCIC_SDS_4_ENABLED
-
 EXTRA_CFLAGS += -Idrivers/scsi/isci/core/ -Idrivers/scsi/isci/
 obj-$(CONFIG_SCSI_ISCI) += isci.o
 isci-objs := init.o phy.o request.o sata.o \

diff --git a/trunk/drivers/scsi/isci/core/intel_sas.h b/trunk/drivers/scsi/isci/core/intel_sas.h
@@ -151,7 +151,6 @@ struct sci_sas_identify_address_frame {
  */
 struct sas_capabilities {
 	union {
-#if defined (SCIC_SDS_4_ENABLED)
 		struct {
 			/**
 			 * The SAS specification indicates the start bit shall always be set to
@@ -172,7 +171,6 @@ struct sas_capabilities {
 			u32 reserved2:17;
 			u32 parity:1;
 		} bits;
-#endif          /* (SCIC_SDS_4_ENABLED) */
 
 		u32 all;
 	} u;

diff --git a/trunk/drivers/scsi/isci/core/sci_controller_constants.h b/trunk/drivers/scsi/isci/core/sci_controller_constants.h
@@ -65,9 +65,6 @@
  *
  */
 
-
-#ifdef SCIC_SDS_4_ENABLED
-
 #ifndef SCI_MAX_PHYS
 /**
  *
@@ -188,12 +185,6 @@
 #define SCI_MIN_SCATTER_GATHER_ELEMENTS 1
 #endif
 
-#else /* SCIC_SDS_4_ENABLED */
-
-#error "SCI Core configuration left unspecified (e.g. SCIC_SDS_4_ENABLED)"
-
-#endif /* SCIC_SDS_4_ENABLED */
-
 /**
  *
  *