hal ChangeLog,1.763,1.764 configure.in,1.114,1.115

[David Zeuthen]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv14434

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-01-21  David Zeuthen  <davidz at redhat.com>

        * configure.in: Remove options for pcmcia as we now rely on sysfs on
        Linux

        * hald/linux2/Makefile.am (libhald_linux2_la_SOURCES): Remove
        pcmcia_cs.h and pcmcia.utils.[ch]

        * hald/linux2/pcmcia_cs.h, hald/linux2/pcmcia_utils.[ch]: Removed

        * hald/linux2/physdev.c (pcmcia_add): Read properties from sysfs
        instead of relying on e.g. /var/pcmcia/stab



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.763
retrieving revision 1.764
diff -u -d -r1.763 -r1.764
--- ChangeLog	21 Jan 2006 19:39:58 -0000	1.763
+++ ChangeLog	21 Jan 2006 19:51:18 -0000	1.764
@@ -1,3 +1,16 @@
+2006-01-21  David Zeuthen  <davidz at redhat.com>
+
+	* configure.in: Remove options for pcmcia as we now rely on sysfs on
+	Linux
+
+	* hald/linux2/Makefile.am (libhald_linux2_la_SOURCES): Remove
+	pcmcia_cs.h and pcmcia.utils.[ch]
+
+	* hald/linux2/pcmcia_cs.h, hald/linux2/pcmcia_utils.[ch]: Removed
+
+	* hald/linux2/physdev.c (pcmcia_add): Read properties from sysfs
+	instead of relying on e.g. /var/pcmcia/stab
+
 2006-01-21  Kay Sievers  <kay.sievers at vrfy.org>
 
 	Remove hotplug helper and depend on udev passing events over

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- configure.in	21 Jan 2006 19:39:58 -0000	1.114
+++ configure.in	21 Jan 2006 19:51:18 -0000	1.115
@@ -82,22 +82,6 @@
     AC_DEFINE(ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
 fi
 
-AC_ARG_ENABLE(pcmcia-support,         [  --enable-pcmcia-support Extended PCMCIA card support],enable_pcmcia_support=yes,enable_pcmcia_support=no)
-if test "x$enable_pcmcia_support" = "xyes" ; then
-   AC_DEFINE(PCMCIA_SUPPORT_ENABLE,1,[Whether PCMCIA card workarounds should be used (for kernels that don't have a sysfsized PCMCIA layer)])
-fi
-AC_SUBST(PCMCIA_SUPPORT_ENABLE)
-AM_CONDITIONAL(PCMCIA_SUPPORT_ENABLE, test x$enable_pcmcia_support = xyes)
-
-AC_ARG_WITH(stab_file,[  --with-stab-file=<file>  PCMCIA socket table file (/var/lib/pcmcia/stab)])
-if test -z "$with_stab_file" ; then
-    PCMCIA_STAB_FILE=/var/lib/pcmcia/stab
-else
-    PCMCIA_STAB_FILE=$with_stab_file
-fi
-AC_SUBST(PCMCIA_STAB_FILE)
-AC_DEFINE_UNQUOTED(PCMCIA_STAB_FILE,"$PCMCIA_STAB_FILE", [PCMCIA socket table file])
-
 # ACPI event source
 AC_ARG_ENABLE(acpi-acpid, [  --disable-acpi-acpid     Use ACPI daemon event source],acpi_acpid=no,acpi_acpid=yes)
 if test "x$acpi_acpid" == "xyes" ; then
@@ -525,8 +509,6 @@
         acpi proc support:        ${acpi_proc}
         acpi daemon support:      ${acpi_acpid}
 
-        Extended PCMCIA support:  ${enable_pcmcia_support}
-        PCMCIA stab file:         ${PCMCIA_STAB_FILE}
         use libusb (for usb-csr): ${USE_LIBUSB}
 
         Maintainer mode:          ${USE_MAINTAINER_MODE}