diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | i386/linux/configure | 33 | ||||
| -rw-r--r-- | i386/linux/device-drivers.h.in | 3 |
3 files changed, 37 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2006-09-23 Stefan Siegl <stesie@brokenpipe.de> + * i386/linux/configure: Regenerate. + * i386/linux/device-drivers.h.in: Likewise. + * 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. diff --git a/i386/linux/configure b/i386/linux/configure index a0e06a1..7248e58 100755 --- a/i386/linux/configure +++ b/i386/linux/configure @@ -800,7 +800,7 @@ Optional Features: --disable-ide disable driver IDE disks --disable-advansys disable driver SCSI controller AdvanSys --disable-BusLogic disable driver SCSI controller BusLogic - --enable-flashpoint enable SCSI flashpoint [default=no] + --enable-flashpoint enable SCSI flashpoint --disable-u1434f disable driver SCSI controller UltraStor 14F/34F --disable-ultrastor disable driver SCSI controller UltraStor --disable-aha152x disable driver SCSI controller Adaptec AHA-152x/2825 @@ -931,6 +931,7 @@ Optional Features: --disable-winbond840 disable driver Ethernet controller Winbond W89c840 PCI Ethernet --disable-i82365 disable driver Intel 82365 PC Card controller + --disable-pcmcia-isa disable isa-bus-support (pcmcia core) --disable-3c574_cs disable driver 3Com 3c574 ``RoadRunner'' PCMCIA Ethernet --disable-3c589_cs disable driver 3Com 3c589 PCMCIA Ethernet card @@ -1717,7 +1718,7 @@ _ACEOF fi fi -#TODO Was ist mit FlashPoint.o? +# TODO. What's that? And what about FlashPoint.o? # Check whether --enable-flashpoint or --disable-flashpoint was given. if test "${enable_flashpoint+set}" = set; then enableval="$enable_flashpoint" @@ -3694,6 +3695,34 @@ fi + # Check whether --enable-pcmcia-isa or --disable-pcmcia-isa was given. +if test "${enable_pcmcia_isa+set}" = set; then + enableval="$enable_pcmcia_isa" + +fi; + enable_pcmcia_isa=${enable_pcmcia_isa-$enable_default_device_drivers} + if test x"$enable_pcmcia_isa" = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define CONFIG_ISA 1 +_ACEOF + + device_drivers="$device_drivers " + if test "${driver_class_pcmcia_selected+set}" != set; then + driver_class_pcmcia_selected=yes + cat >>confdefs.h <<_ACEOF +#define $driver_class_pcmcia_option 1 +_ACEOF + + device_drivers="$device_drivers $driver_class_pcmcia_files" + fi + fi + + + + + + # Check whether --enable-3c574_cs or --disable-3c574_cs was given. if test "${enable_3c574_cs+set}" = set; then enableval="$enable_3c574_cs" diff --git a/i386/linux/device-drivers.h.in b/i386/linux/device-drivers.h.in index 240255e..d5ae3ea 100644 --- a/i386/linux/device-drivers.h.in +++ b/i386/linux/device-drivers.h.in @@ -108,6 +108,9 @@ /* intelgige */ #undef CONFIG_INTEL_GIGE +/* disable isa-bus-support (pcmcia core) */ +#undef CONFIG_ISA + /* lance */ #undef CONFIG_LANCE |