hal: Branch 'master'

[Martin Pitt]

 hald/freebsd/probing/probe-volume.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 026998cd83428776f833d251365dd6c247715894
Author: Aurelien Jarno <aurelien at aurel32.net>
Date:   Thu Sep 17 15:45:24 2009 +0200

    Fix build failure on GNU/kFreeBSD
    
    As the code of hald/freebsd/probing/probe-volume.c is shared between plain
    FreeBSD and GNU/kFreeBSD, the version check should also be done with
    __FreeBSD_kernel_version.

diff --git a/hald/freebsd/probing/probe-volume.c b/hald/freebsd/probing/probe-volume.c
index 5965a64..73e0318 100644
--- a/hald/freebsd/probing/probe-volume.c
+++ b/hald/freebsd/probing/probe-volume.c
@@ -64,7 +64,7 @@ struct iso_path_table_entry
 };
 #define ISO_PATH_TABLE_ENTRY_SIZE         8
 
-#if __FreeBSD_version < 600101
+#if (__FreeBSD_version < 600101) && (__FreeBSD_kernel_version < 600101)
 static uint32_t
 isonum_731(unsigned char *p)
 {