3 files changed, 3 insertions, 2 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 7e9fd38e14fb..44b324b80e90 100644
--- a/drivers/pcmcia/Kconfig
+++ b/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/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 7f79c4e169ae..3a1fe3ab2cd4 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/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/include/pcmcia/ss.h b/include/pcmcia/ss.h
index b4e5cfd49ce1..1a4737933bf3 100644
--- a/include/pcmcia/ss.h
+++ b/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.