---

yaml --- r: 169131 b: refs/heads/master c: 638bba5 h: refs/heads/master i: 169129: de975a7 169127: 198accc v: v3
git-mirror · Nov 9, 2009 · d8de1f0 · d8de1f0
1 parent 592c560
commit d8de1f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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: