[PATCH] pcmcia: request CIS via firmware interface

Use the firmware method to load replacement CIS tables.  It is recommended
that the /lib/firmware/cis/ points to /etc/pcmcia/cis or the other way round
so that both old-style cardmgr and new-style hotplug/firmware can access these
"overwrite" files

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 14e4124e1523..22f7e8ca6584 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -58,6 +58,20 @@ config PCMCIA
 
            If unsure, say Y.
 
+config PCMCIA_LOAD_CIS
+        bool "Load CIS updates from userspace (EXPERIMENTAL)"
+        depends on PCMCIA && EXPERIMENTAL
+        select FW_LOADER
+        default y
+        help
+          Some PCMCIA cards require an updated Card Information Structure (CIS)
+          to be loaded from userspace to work correctly. If you say Y here,
+          and your userspace is arranged correctly, this will be loaded
+          automatically using the in-kernel firmware loader and the hotplug
+          subsystem, instead of relying on cardmgr from pcmcia-cs to do so.
+
+          If unsure, say Y.
+
 config CARDBUS
         bool "32-bit CardBus support"   
         depends on PCI