hal/hald Makefile.am,1.39,1.39.2.1

[David Zeuthen]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv9479/hald

Modified Files:
      Tag: hal-0_4-stable-branch
	Makefile.am 
Log Message:
2005-01-21  David Zeuthen  <davidz at redhat.com>

	* tools/fstab-sync.c (remove_udi): Check for return value to
	avoid dereferencing a NULL pointer

	* hald/linux/block_class_device.c (block_class_pre_process): Only
	do drive_id real SCSI since doing an INQUIRY on USB devices may
	crash the device if the transfer length is not exactly 36 bytes.

	* hald/linux/libsysfs/sysfs.h: Remove the #define DEBUG symbol
	again

	* hald/Makefile.am (hald_SOURCES): Add linux/pcmcia_bus_device.c

	* hald/linux/pcmcia_bus_device.c: New file

	* hald/linux/osspec.c: Add support for 16-bit PCMCIA in sysfs;
	without this hald won't work for 16-bit PCMCIA cards and a 
	kernel with sysfs support for those.



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- Makefile.am	26 Oct 2004 17:35:21 -0000	1.39
+++ Makefile.am	21 Jan 2005 15:46:55 -0000	1.39.2.1
@@ -48,6 +48,7 @@
 					linux/ide_bus_device.c		\
 					linux/pcmcia_socket_class_device.c \
 					linux/macio_bus_device.c	\
+					linux/pcmcia_bus_device.c	\
 					linux/ieee1394_class_device.c	\
 					linux/ieee1394_node_class_device.c \
 					linux/ieee1394_host_class_device.c \