Index: i386/linux/configure.ac
===================================================================
RCS file: /sources/hurd/gnumach/i386/linux/Attic/configure.ac,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 configure.ac
--- i386/linux/configure.ac	27 Jul 2006 09:50:07 -0000	1.1.2.6
+++ i386/linux/configure.ac	28 Aug 2006 00:43:34 -0000
@@ -233,6 +233,24 @@ dnl PCMCIA device support.
 
 linux_DRIVER([i82365], [I82365], [i82365], [pcmcia])
 
+AC_DEFUN([AC_PCMCIA_OPTION], [
+  AC_ARG_ENABLE([pcmcia-$1], 
+  AS_HELP_STRING([--enable-pcmcia-$1], [$4]), [
+  if test "x$enableval" != "xno"; 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], [],
+		 [enable isa-bus-support (pcmcia core)])
+
+
 dnl PCMCIA device drivers.
 
 linux_DRIVER([3c574_cs], [3C574_CS], [3c574_cs], [pcmcia])
Index: doc/mach.texi
===================================================================
RCS file: /sources/hurd/gnumach/doc/mach.texi,v
retrieving revision 1.4.2.3
diff -u -p -r1.4.2.3 mach.texi
--- doc/mach.texi	31 Jul 2006 09:41:52 -0000	1.4.2.3
+++ doc/mach.texi	28 Aug 2006 00:53:01 -0000
@@ -880,7 +880,8 @@ Enables the Sundance ST201 "Alta" PCI Et
 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.  
@@ -889,6 +890,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