diff --git a/[refs] b/[refs]
index bd688fa31def..048542b9363e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6f6404c038b004fdb93f0676db934d69c524f7e
+refs/heads/master: c6d42257899505ea1982eba4c5e8bc7981e63e07
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig
index e18938bebcd3..8d9dae89f065 100644
--- a/trunk/drivers/scsi/Kconfig
+++ b/trunk/drivers/scsi/Kconfig
@@ -843,24 +843,6 @@ config SCSI_ISCI
 
 	  The experimental tag will be removed after the driver exits alpha
 
-choice
-	prompt "Default Silicon Revision"
-	depends on SCSI_ISCI
-	default PBG_HBA_A2
-	# temporary A-step silicon is pre-production
-
-config PBG_HBA_BETA
-	bool "B0"
-
-config PBG_HBA_A2
-	bool "A2"
-
-config PBG_HBA_A0
-	bool "A0"
-
-endchoice
-
-
 config SCSI_GENERIC_NCR5380
 	tristate "Generic NCR5380/53c400 SCSI PIO support"
 	depends on ISA && SCSI
diff --git a/trunk/drivers/scsi/isci/init.c b/trunk/drivers/scsi/isci/init.c
index 10b60ab261e1..6c2d686fe7c0 100644
--- a/trunk/drivers/scsi/isci/init.c
+++ b/trunk/drivers/scsi/isci/init.c
@@ -87,15 +87,9 @@ MODULE_DEVICE_TABLE(pci, isci_id_table);
 
 /* linux isci specific settings */
 
-#if defined(CONFIG_PBG_HBA_A0)
-int isci_si_rev = ISCI_SI_REVA0;
-#elif defined(CONFIG_PBG_HBA_A2)
 int isci_si_rev = ISCI_SI_REVA2;
-#else
-int isci_si_rev = ISCI_SI_REVB0;
-#endif
 module_param(isci_si_rev, int, 0);
-MODULE_PARM_DESC(isci_si_rev, "override default si rev (0: A0 1: A2 2: B0)");
+MODULE_PARM_DESC(isci_si_rev, "(deprecated) override default si rev (0: A0 1: A2 2: B0)");
 
 unsigned char no_outbound_task_to = 20;
 module_param(no_outbound_task_to, byte, 0);