From d8de1f0e39354046a299c40b38259cf6bcc8296a Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sat, 7 Nov 2009 12:26:17 +0100
Subject: [PATCH] --- yaml --- r: 169131 b: refs/heads/master c:
 638bba55fe6440439005f02fcd6b0c1f908d0d11 h: refs/heads/master i:   169129:
 de975a7419e6e027e5df8a5a54edb5408bc6f889   169127:
 198accca08fb16662eeeac49ea51801a270bfcc7 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pcmcia/cs.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9fa88913ab04..d309564a0ede 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55a19b39acb8888af8e9cfe5b762d03c52fdb48c
+refs/heads/master: 638bba55fe6440439005f02fcd6b0c1f908d0d11
diff --git a/trunk/drivers/pcmcia/cs.c b/trunk/drivers/pcmcia/cs.c
index b229f6d9e443..fc1c0c6baae2 100644
--- a/trunk/drivers/pcmcia/cs.c
+++ b/trunk/drivers/pcmcia/cs.c
@@ -243,6 +243,13 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
 
 	pcmcia_parse_events(socket, SS_DETECT);
 
+	/*
+	 * Let's try to get the PCMCIA module for 16-bit PCMCIA support.
+	 * If it fails, it doesn't matter -- we still have 32-bit CardBus
+	 * support to offer, so this is not a failure mode.
+	 */
+	request_module_nowait("pcmcia");
+
 	return 0;
 
  err: