From 25de69dfd6b04e91285b968011423d65a407da98 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 22 Sep 2010 12:17:16 -0700 Subject: [PATCH] --- yaml --- r: 219973 b: refs/heads/master c: 7832167b694e545fc2f010ddaafc223ab7d17725 h: refs/heads/master i: 219971: 2d9dc15b49096914df35ca97a35196bdd2a05d1f v: v3 --- [refs] | 2 +- trunk/drivers/staging/ft1000/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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