From 5f2fe5548e0500ef902bfdc8014dd4e3f6b1bf58 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 15 Jun 2012 09:18:55 -0700
Subject: [PATCH] --- yaml --- r: 317399 b: refs/heads/master c:
 dc348147a9e1ba84395d1e585d26af44f0ca4e29 h: refs/heads/master i:   317397:
 054e431da6ae6875ff3de2169c02896dd97ca31f   317395:
 c744475a7376f0774f22ccc07d8054fbbaed24bf   317391:
 eb81f9d35f18fc54c687eec03a053075d002933a v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/comedi/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 78253b11f299..0124c6499261 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aff1eb4e3dd13ee419c6cd76baf1bcc2edeaaa86
+refs/heads/master: dc348147a9e1ba84395d1e585d26af44f0ca4e29
diff --git a/trunk/drivers/staging/comedi/Kconfig b/trunk/drivers/staging/comedi/Kconfig
index 848cf7e3e8fd..2ca7f08bc5b9 100644
--- a/trunk/drivers/staging/comedi/Kconfig
+++ b/trunk/drivers/staging/comedi/Kconfig
@@ -1097,7 +1097,7 @@ endif # COMEDI_PCI_DRIVERS
 
 menuconfig COMEDI_PCMCIA_DRIVERS
 	tristate "Comedi PCMCIA drivers"
-	depends on (PCMCIA || PCCARD)
+	depends on PCMCIA
 	---help---
 	  Enable comedi PCMCIA and PCCARD drivers to be built