From be58481baf83f9d79a7711953c0573bd88a18ea5 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Sat, 6 Mar 2010 13:31:17 +0100 Subject: [PATCH] --- yaml --- r: 192534 b: refs/heads/master c: acd200bf45487271d54f05938ad9e30f32a530ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/Kconfig | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/[refs] b/[refs] index aba63a5b8c1d..9283d1b7a6c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7622802e479e30a2258afdbfd31acaf829636e7a +refs/heads/master: acd200bf45487271d54f05938ad9e30f32a530ee diff --git a/trunk/drivers/pcmcia/Kconfig b/trunk/drivers/pcmcia/Kconfig index 4c5b53f62079..caca50eaa0e7 100644 --- a/trunk/drivers/pcmcia/Kconfig +++ b/trunk/drivers/pcmcia/Kconfig @@ -49,26 +49,6 @@ config PCMCIA_LOAD_CIS If unsure, say Y. -config PCMCIA_IOCTL - bool "PCMCIA control ioctl (obsolete)" - depends on PCMCIA && ARM && !SMP && !PREEMPT - default y - help - If you say Y here, the deprecated ioctl interface to the PCMCIA - subsystem will be built. It is needed by the deprecated pcmcia-cs - tools (cardmgr, cardctl) to function properly. - - You should use the new pcmciautils package instead (see - for location and details). - - This config option will most likely be removed from kernel 2.6.35, - the associated code from kernel 2.6.36. - - As the PCMCIA ioctl is not locking safe, it depends on !SMP and - !PREEMPT. - - If unsure, say N. - config CARDBUS bool "32-bit CardBus support" depends on PCI