diff --git a/[refs] b/[refs]
index 841c1fa3e298..636036b2975f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e92049a1bbc4d84504b4c7886cf048fc5750259f
+refs/heads/master: 7832167b694e545fc2f010ddaafc223ab7d17725
diff --git a/trunk/drivers/staging/ft1000/Kconfig b/trunk/drivers/staging/ft1000/Kconfig
index c54b4e83d6e9..d6da1304b45f 100644
--- a/trunk/drivers/staging/ft1000/Kconfig
+++ b/trunk/drivers/staging/ft1000/Kconfig
@@ -13,7 +13,7 @@ config FT1000_USB
 
 config FT1000_PCMCIA
 	tristate "Driver for ft1000 pcmcia device."
-	depends on PCMCIA
+	depends on PCMCIA && BROKEN
 	depends on NET
 	help
 	  Say Y if you want to have support for Flarion card also called