[PATCH] fix pcmcia probing to work on parisc

[James Bottomley]

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 =====
--- 1.11/drivers/pcmcia/Kconfig	2004-06-19 12:10:24 -05:00
+++ edited/drivers/pcmcia/Kconfig	2004-10-16 09:49:49 -05:00
@@ -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 =====
--- 1.41/drivers/pcmcia/rsrc_mgr.c	2004-10-10 12:39:48 -05:00
+++ edited/drivers/pcmcia/rsrc_mgr.c	2004-10-16 09:50:28 -05:00
@@ -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);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/