hal/hald/linux2 Makefile.am, 1.8, 1.9 acpi.c, 1.8, 1.9 blockdev.c, 1.7, 1.8 classdev.c, 1.15, 1.16 coldplug.c, 1.9, 1.10 hotplug.h, 1.5, 1.6 osspec.c, 1.17, 1.18 physdev.c, 1.8, 1.9

[David Zeuthen]

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

Modified Files:
	Makefile.am acpi.c blockdev.c classdev.c coldplug.c hotplug.h 
	osspec.c physdev.c 
Log Message:
2005-02-24  David Zeuthen  <davidz at redhat.com>

	Fix a few things to get 'make distcheck' to succeed.



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	8 Feb 2005 22:36:58 -0000	1.8
+++ Makefile.am	24 Feb 2005 17:33:03 -0000	1.9
@@ -16,6 +16,7 @@
 				osspec.c			\
 	osspec_linux.h						\
 	hotplug.h		hotplug.c			\
+	hotplug_helper.h					\
 	coldplug.h		coldplug.c			\
 	physdev.h		physdev.c			\
 	classdev.h		classdev.c			\
@@ -24,7 +25,9 @@
 	apm.h			apm.c				\
 	pmu.h			pmu.c				\
 	ids.h			ids.c				\
-	pcmcia_utils.h		pcmcia_utils.c
+	pcmcia_utils.h		pcmcia_utils.c			\
+	pcmcia_cs.h
+
 
 
 

Index: acpi.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/acpi.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- acpi.c	24 Feb 2005 16:50:34 -0000	1.8
+++ acpi.c	24 Feb 2005 17:33:03 -0000	1.9
@@ -29,7 +29,7 @@
 #include "../device_info.h"
 #include "../logger.h"
 #include "../hald_dbus.h"
-#include "util.h"
+#include "../util.h"
 
 #include "osspec_linux.h"
 

Index: blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- blockdev.c	24 Feb 2005 16:50:35 -0000	1.7
+++ blockdev.c	24 Feb 2005 17:33:03 -0000	1.8
@@ -58,10 +58,10 @@
 #include "../hald.h"
 #include "../device_info.h"
 #include "../hald_dbus.h"
+#include "../util.h"
 
 #include "osspec_linux.h"
 
-#include "util.h"
 #include "coldplug.h"
 #include "hotplug_helper.h"
 

Index: classdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/classdev.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- classdev.c	24 Feb 2005 16:50:35 -0000	1.15
+++ classdev.c	24 Feb 2005 17:33:03 -0000	1.16
@@ -63,10 +63,10 @@
 #include "../logger.h"
 #include "../hald.h"
 #include "../device_info.h"
+#include "../util.h"
 
 #include "osspec_linux.h"
 
-#include "util.h"
 #include "coldplug.h"
 #include "hotplug_helper.h"
 

Index: coldplug.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/coldplug.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- coldplug.c	24 Feb 2005 16:50:35 -0000	1.9
+++ coldplug.c	24 Feb 2005 17:33:03 -0000	1.10
@@ -43,10 +43,10 @@
 #include "../logger.h"
 #include "../hald.h"
 #include "../device_info.h"
+#include "../util.h"
 
 #include "osspec_linux.h"
 
-#include "util.h"
 #include "coldplug.h"
 #include "hotplug.h"
 

Index: hotplug.h
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/hotplug.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hotplug.h	11 Feb 2005 22:01:08 -0000	1.5
+++ hotplug.h	24 Feb 2005 17:33:03 -0000	1.6
@@ -28,8 +28,8 @@
 
 #include <glib.h>
 
-#include "util.h"
 #include "../device.h"
+#include "../util.h"
 
 typedef enum {
 	HOTPLUG_EVENT_SYSFS       = 0,

Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/osspec.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- osspec.c	24 Feb 2005 16:50:35 -0000	1.17
+++ osspec.c	24 Feb 2005 17:33:03 -0000	1.18
@@ -71,8 +71,8 @@
 #include "../hald.h"
 #include "../hald_dbus.h"
 #include "../device_info.h"
+#include "../util.h"
 
-#include "util.h"
 #include "hotplug.h"
 #include "coldplug.h"
 

Index: physdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/physdev.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- physdev.c	24 Feb 2005 16:50:35 -0000	1.8
+++ physdev.c	24 Feb 2005 17:33:03 -0000	1.9
@@ -46,8 +46,8 @@
 #include "../logger.h"
 #include "../hald.h"
 #include "../device_info.h"
+#include "../util.h"
 
-#include "util.h"
 #include "coldplug.h"
 #include "hotplug_helper.h"