diff --git a/[refs] b/[refs]
index a167a3f2de7c..85a5f7273f42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00bf256011d362e7d61824f3cda8514f5d48585d
+refs/heads/master: 40d1bac4ad26066bea7c790d9d33446838dc8b6d
diff --git a/trunk/drivers/staging/et131x/Kconfig b/trunk/drivers/staging/et131x/Kconfig
index e11cf340856a..f0ed08d6a977 100644
--- a/trunk/drivers/staging/et131x/Kconfig
+++ b/trunk/drivers/staging/et131x/Kconfig
@@ -7,12 +7,3 @@ config ET131X
 
 	  To compile this driver as a module, choose M here. The module
 	  will be called et131x.
-
-config ET131X_DEBUG
-	bool "Enable et131x debugging"
-	depends on ET131X
-	default n
-	---help---
-	  Say Y for detailed debug information.
-
-	  If in doubt, say N.
diff --git a/trunk/drivers/staging/pohmelfs/Kconfig b/trunk/drivers/staging/pohmelfs/Kconfig
index 58158b8780f4..8d53b1a1e715 100644
--- a/trunk/drivers/staging/pohmelfs/Kconfig
+++ b/trunk/drivers/staging/pohmelfs/Kconfig
@@ -18,11 +18,3 @@ config POHMELFS_DEBUG
 	  Turns on excessive POHMELFS debugging facilities.
 	  You usually do not want to slow things down noticeably and get really
 	  lots of kernel messages in syslog.
-
-config POHMELFS_CRYPTO
-	bool "POHMELFS crypto support"
-	depends on POHMELFS
-	help
-	  This option allows to encrypt and/or protect with strong
-	  cryptographic hash all dataflow between server and clients.
-	  Each config group can have its own keys.