[PATCH] include mount.h instead of include linux/fs.h

[Kay Sievers]

This should fix pgoff_t no defined with some linux headers.

Ok to commit?

Thanks,
Kay
-------------- next part --------------
Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.87
diff -u -r1.87 configure.in
--- configure.in	29 Jun 2005 20:21:04 -0000	1.87
+++ configure.in	1 Jul 2005 10:27:38 -0000
@@ -294,8 +294,7 @@
 AC_MSG_CHECKING(for BLKGETSIZE64)
 AC_TRY_COMPILE(
 [#include <sys/types.h>
-#include <linux/ioctl.h>
-#include <linux/fs.h>],
+#include <sys/mount.h>],
 [int main(int argc, char *argv[])
 {
 	int fd = 0;
Index: hald/linux2/addons/addon-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-storage.c,v
retrieving revision 1.6
diff -u -r1.6 addon-storage.c
--- hald/linux2/addons/addon-storage.c	2 May 2005 16:08:59 -0000	1.6
+++ hald/linux2/addons/addon-storage.c	1 Jul 2005 10:27:39 -0000
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <linux/kdev_t.h>
 #include <linux/cdrom.h>
-#include <linux/fs.h>
+#include <sys/mount.h>
 #include <mntent.h>
 
 #include "libhal/libhal.h"
Index: hald/linux2/probing/probe-pc-floppy.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-pc-floppy.c,v
retrieving revision 1.2
diff -u -r1.2 probe-pc-floppy.c
--- hald/linux2/probing/probe-pc-floppy.c	8 Apr 2005 18:10:20 -0000	1.2
+++ hald/linux2/probing/probe-pc-floppy.c	1 Jul 2005 10:27:39 -0000
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <linux/kdev_t.h>
 #include <linux/cdrom.h>
-#include <linux/fs.h>
+#include <sys/mount.h>
 #include <linux/fd.h>
 
 #include "libhal/libhal.h"
Index: hald/linux2/probing/probe-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-storage.c,v
retrieving revision 1.8
diff -u -r1.8 probe-storage.c
--- hald/linux2/probing/probe-storage.c	21 May 2005 00:23:21 -0000	1.8
+++ hald/linux2/probing/probe-storage.c	1 Jul 2005 10:27:39 -0000
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <linux/kdev_t.h>
 #include <linux/cdrom.h>
-#include <linux/fs.h>
+#include <sys/mount.h>
 #include <mntent.h>
 
 #include "libhal/libhal.h"
Index: hald/linux2/probing/probe-volume.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-volume.c,v
retrieving revision 1.9
diff -u -r1.9 probe-volume.c
--- hald/linux2/probing/probe-volume.c	16 Jun 2005 20:58:02 -0000	1.9
+++ hald/linux2/probing/probe-volume.c	1 Jul 2005 10:27:39 -0000
@@ -40,7 +40,7 @@
 #include <ctype.h>
 #include <linux/kdev_t.h>
 #include <linux/cdrom.h>
-#include <linux/fs.h>
+#include <sys/mount.h>
 #include <time.h>
 #include <sys/time.h>
 
Index: tools/linux/add_selinux.c
===================================================================
RCS file: /cvs/hal/hal/tools/linux/add_selinux.c,v
retrieving revision 1.2
diff -u -r1.2 add_selinux.c
--- tools/linux/add_selinux.c	13 Mar 2005 23:28:40 -0000	1.2
+++ tools/linux/add_selinux.c	1 Jul 2005 10:27:39 -0000
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <linux/kdev_t.h>
 #include <linux/cdrom.h>
-#include <linux/fs.h>
+#include <sys/mount.h>
 #include <mntent.h>
 #include <selinux/selinux.h>
 
-------------- next part --------------
_______________________________________________
hal mailing list
hal at lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/hal