---

yaml --- r: 181977 b: refs/heads/master c: 4e8804f h: refs/heads/master i: 181975: 4c2cbbd v: v3
git-mirror · Feb 17, 2010 · b5e882e · b5e882e
1 parent 96177d5
commit b5e882e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7eb169dc7292979d78f2d2f1655026ae3a9ff5f
+refs/heads/master: 4e8804ff6dd1a842d9531c819a0acc9eb3bcfa3b
diff --git a/trunk/drivers/pcmcia/Kconfig b/trunk/drivers/pcmcia/Kconfig
@@ -163,7 +163,6 @@ config PCMCIA_M8XX
 	tristate "MPC8xx PCMCIA support"
 	depends on PCMCIA && PPC && 8xx
 	select PCCARD_IODYN
-	select PCCARD_NONSTATIC
 	help
 	  Say Y here to include support for PowerPC 8xx series PCMCIA
 	  controller.

diff --git a/trunk/drivers/pcmcia/m8xx_pcmcia.c b/trunk/drivers/pcmcia/m8xx_pcmcia.c
@@ -1233,7 +1233,7 @@ static int __init m8xx_probe(struct of_device *ofdev,
 		socket[i].socket.io_offset = 0;
 		socket[i].socket.pci_irq = pcmcia_schlvl;
 		socket[i].socket.ops = &m8xx_services;
-		socket[i].socket.resource_ops = &pccard_nonstatic_ops;
+		socket[i].socket.resource_ops = &pccard_iodyn_ops;
 		socket[i].socket.cb_dev = NULL;
 		socket[i].socket.dev.parent = &ofdev->dev;
 		socket[i].pcmcia = pcmcia;

diff --git a/trunk/include/pcmcia/ss.h b/trunk/include/pcmcia/ss.h
@@ -258,6 +258,8 @@ struct pcmcia_socket {
  * - pccard_static_ops		iomem and ioport areas are assigned statically
  * - pccard_iodyn_ops		iomem areas is assigned statically, ioport
  *				areas dynamically
+ *				If this option is selected, use
+ *				"select PCCARD_IODYN" in Kconfig.
  * - pccard_nonstatic_ops	iomem and ioport areas are assigned dynamically.
  *				If this option is selected, use
  *				"select PCCARD_NONSTATIC" in Kconfig.