diff --git a/[refs] b/[refs]
index 96fc696e47f2..cbd92162cec5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a01e70e570a72b8a8c9a58062e4f5bdcd3986222
+refs/heads/master: 2b7cbe20174695bca1afe2a8f755e1eb299f4768
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig
index 4d1998d23f0f..a6f920d218a0 100644
--- a/trunk/drivers/scsi/Kconfig
+++ b/trunk/drivers/scsi/Kconfig
@@ -28,7 +28,7 @@ config SCSI
 	  (the one containing the directory /) is located on a SCSI device.
 
 config SCSI_NETLINK
-	tristate
+	bool
 	default	n
 	select NET