2006-09-23 Stefan Siegl <stesie@brokenpipe.de>

* i386/linux/configure.ac (AC_PCMCIA_OPTION): New function.
	(--disable-pcmcia-isa): New configuration option to disable ISA-bus
	support in the pcmcia core, which is otherwise enabled now by default.
	* doc/mach.texi (Configuration): Briefly document the new configuration
	option.
	* i386/README-Drivers: Likewise.

4 files changed, 39 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a9de8ed5..4ecfdb61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-23  Stefan Siegl  <stesie@brokenpipe.de>
+
+	* i386/linux/configure.ac (AC_PCMCIA_OPTION): New function.
+	(--disable-pcmcia-isa): New configuration option to disable ISA-bus
+	support in the pcmcia core, which is otherwise enabled now by default.
+	* doc/mach.texi (Configuration): Briefly document the new configuration
+	option.
+	* i386/README-Drivers: Likewise.
+	
 2006-09-20  Thomas Schwinge  <tschwinge@gnu.org>
 
 	* configure: Regenerate.
diff --git a/doc/mach.texi b/doc/mach.texi
index e7e12347..33a6110a 100644
--- a/doc/mach.texi
+++ b/doc/mach.texi
@@ -883,7 +883,8 @@ Enables the Sundance ST201 "Alta" PCI Ethernet devices eth%d.
 Enables the Winbond W89c840 PCI Ethernet devices eth%d.
 @end table
 
-The following options enable drivers for supported PCMCIA bridges.
+The following options either enable drivers for supported PCMCIA
+bridges or control the overall behaviour of the GNU Mach PCMCIA core.
 To make use of GNU Mach PCMCIA support you need to have the
 corresponding userland applications (GNU Mach Card Services)
 installed.  
@@ -892,6 +893,12 @@ installed.
 @item --enable-i82365
 Enables the driver for the Intel 82365 and compatible PC Card
 controllers, and Yenta-compatible PCI-to-CardBus controllers.
+
+@item --enable-pcmcia-isa
+Enables ISA-bus related bits in the GNU Mach PCMCIA core.  This is
+generally a good idea, since it does not only have effect if your
+PC Card bridge is attached to the ISA bus, but provides more (ISA)
+interrupts to the Card Services for it to assign to the cards in turn.
 @end table
 
 The following options enable drivers for supported PCMCIA Ethernet
diff --git a/i386/README-Drivers b/i386/README-Drivers
index fa5fdfbb..d785b4a9 100644
--- a/i386/README-Drivers
+++ b/i386/README-Drivers
@@ -372,6 +372,9 @@ All source files are relative to [GNU Mach]/linux/pcmcia-cs.
 Intel 82365 PC Card controller
   --disable-i82365			modules/i82365.c
 
+Disable scan for ISA interrupts at startup
+  --disable-pcmcia-isa			modules/i82365.c
+
 *** pcmcia device drivers
 
 These all show up as `eth%d'.
diff --git a/i386/linux/configure.ac b/i386/linux/configure.ac
index 9ce468c2..6af8eb79 100644
--- a/i386/linux/configure.ac
+++ b/i386/linux/configure.ac
@@ -365,6 +365,25 @@ linux_DRIVER([i82365],
   [Intel 82365 PC Card controller],
   [I82365], [i82365], [pcmcia])
 
+AC_DEFUN([AC_PCMCIA_OPTION], [
+  AC_ARG_ENABLE([pcmcia-$1], 
+    AS_HELP_STRING([--disable-pcmcia-$1], [$4]))
+  [enable_pcmcia_$1=${enable_pcmcia_$1-$enable_default_device_drivers}
+  if test x"$enable_pcmcia_$1" = xyes; then]
+    AC_DEFINE([CONFIG_$2], [1], [$4])
+    [device_drivers="$device_drivers $3"
+    if test "${driver_class_pcmcia_selected+set}" != set; then
+      driver_class_pcmcia_selected=yes]
+      AC_DEFINE_UNQUOTED([$driver_class_pcmcia_option], [1])
+      [device_drivers="$device_drivers $driver_class_pcmcia_files"
+    fi
+  fi
+]])
+
+AC_PCMCIA_OPTION([isa], [ISA], [],
+		 [disable isa-bus-support (pcmcia core)])
+
+
 dnl PCMCIA device drivers.
 
 linux_DRIVER([3c574_cs],