aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/Kconfig
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-06 06:18:13 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2010-01-24 13:57:56 -0500
commita7eb169dc7292979d78f2d2f1655026ae3a9ff5f (patch)
tree75b72b9edefc8a80179446cc1f0913ed93c039bd /drivers/pcmcia/Kconfig
parentf9c316f4a2d32e4d03497ecb24e1d2309361a5b8 (diff)
pcmcia: m32r uses static socket resources
m32r_cfc sets the socket capabilities to SS_CAP_STATIC_MAP and also sets io_offset != 0. This means no calls to &pccard_nonstatic_ops went through. Therfore, replace it with &pccard_static_ops which is exactly for this case. CC: Mamoru Sakugawa <sakugawa@linux-m32r.org> CC: Hirokazu Takata <takata@linux-m32r.org> Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/Kconfig')
-rw-r--r--drivers/pcmcia/Kconfig2
1 files changed, 0 insertions, 2 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
238config M32R_PCC 238config M32R_PCC
239 bool "M32R PCMCIA I/F" 239 bool "M32R PCMCIA I/F"
240 depends on M32R && CHIP_M32700 && PCMCIA 240 depends on M32R && CHIP_M32700 && PCMCIA
241 select PCCARD_NONSTATIC
242 help 241 help
243 Say Y here to use the M32R PCMCIA controller. 242 Say Y here to use the M32R PCMCIA controller.
244 243
245config M32R_CFC 244config M32R_CFC
246 bool "M32R CF I/F Controller" 245 bool "M32R CF I/F Controller"
247 depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT) 246 depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_MAPPI3 || PLAT_OPSPUT)
248 select PCCARD_NONSTATIC
249 help 247 help
250 Say Y here to use the M32R CompactFlash controller. 248 Say Y here to use the M32R CompactFlash controller.
251 249