From b5e882e5732a3ff59f37bc960cb1b0944f9e71db Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Wed, 6 Jan 2010 11:19:25 +0100
Subject: [PATCH] --- yaml --- r: 181977 b: refs/heads/master c:
 4e8804ff6dd1a842d9531c819a0acc9eb3bcfa3b h: refs/heads/master i:   181975:
 4c2cbbdb682890f78e57ce7d36e33e8085e23bf4 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/pcmcia/Kconfig       | 1 -
 trunk/drivers/pcmcia/m8xx_pcmcia.c | 2 +-
 trunk/include/pcmcia/ss.h          | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4e6638fd74da..3c7f026e6472 100644
--- 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
index 7e9fd38e14fb..44b324b80e90 100644
--- 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
index 7f79c4e169ae..3a1fe3ab2cd4 100644
--- 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
index b4e5cfd49ce1..1a4737933bf3 100644
--- 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.