Skip to contentSkip to conversation

fix pcmcia probing to work on parisc

PATCH New James Bottomley 1 participant 1 message Oct 16, 2004 Pcmcia

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix pcmcia probing to work on parisc

Hi Russell,

This is the last piece of our parisc PCMCIA puzzle after I converted the original code to use the new resource manager stuff. Basically, we can't be probed either on memory or on I/O. Since it looks like the other two arm architectures which don't set CONFIG_PCMCIA_PROBE still do memory probing, I introduced a new option to control this (CONFIG_PCMCIA_PROBE_MEM).

James

===== drivers/pcmcia/Kconfig 1.11 vs edited =====

drivers/pcmcia/Kconfig +5 -1
@@ -136,7 +136,11 @@
 
 config PCMCIA_PROBE
 	bool
-	default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X
+	default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X && !PARISC
+
+config PCMCIA_PROBE_MEM
+	bool
+	default y if !PARISC
 
 endmenu
 

===== drivers/pcmcia/rsrc_mgr.c 1.41 vs edited =====

drivers/pcmcia/rsrc_mgr.c +4 -0
@@ -59,7 +59,11 @@
 
 #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444)
 
+#ifdef CONFIG_PCMCIA_PROBE_MEM
 INT_MODULE_PARM(probe_mem,	1);		/* memory probe? */
+#else
+INT_MODULE_PARM(probe_mem,	0);		/* memory probe? */
+#endif
 #ifdef CONFIG_PCMCIA_PROBE
 INT_MODULE_PARM(probe_io,	1);		/* IO port probe? */
 INT_MODULE_PARM(mem_limit,	0x10000);