2 files changed, 1 insertions, 3 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 9f3adbd9f700..7e9fd38e14fb 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -238,14 +238,12 @@ config PCMCIA_PROBE
 config M32R_PCC
         bool "M32R PCMCIA I/F"
         depends on M32R && CHIP_M32700 && PCMCIA
-        select PCCARD_NONSTATIC
         help
           Say Y here to use the M32R PCMCIA controller.
 
 config M32R_CFC
         bool "M32R CF I/F Controller"
         depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)
-        select PCCARD_NONSTATIC
         help
           Say Y here to use the M32R CompactFlash controller.
 
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
index 26a621c9e2fc..0ece2cd4a85e 100644
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -764,7 +764,7 @@ static int __init init_m32r_pcc(void)
         for (i = 0 ; i < pcc_sockets ; i++) {
                 socket[i].socket.dev.parent = &pcc_device.dev;
                 socket[i].socket.ops = &pcc_operations;
-                socket[i].socket.resource_ops = &pccard_nonstatic_ops;
+                socket[i].socket.resource_ops = &pccard_static_ops;
                 socket[i].socket.owner = THIS_MODULE;
                 socket[i].number = i;
                 ret = pcmcia_register_socket(&socket[i].socket);