hal: Branch 'master'

[Richard Hughes]

 hald/create_cache.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

New commits:
diff-tree edef57f684d34513f542344c0cc4bad40bccf043 (from 558d4315edd4921cfdabb9f6648316dc50f05395)
Author: Doug Goldstein <cardoe at gentoo.org>
Date:   Fri Jun 1 08:47:28 2007 +0100

    fix trivial bugs in hald-generate-fdi-cache
    
    hald-generate-fdi-cache's usage is incorrect. This patch cleans it up.

diff --git a/hald/create_cache.c b/hald/create_cache.c
index ab7b724..9578a42 100644
--- a/hald/create_cache.c
+++ b/hald/create_cache.c
@@ -699,14 +699,14 @@ error:
 static void
 usage ()
 {
-	fprintf (stderr, "\n" "usage : hald-cache [--verbose=yes|no] [--use-syslog] [--help]\n");
+	fprintf (stderr, "\n" "usage : hald-generate-fdi-cache [OPTION]\n");
 	fprintf (stderr,
 		 "\n"
 		 "        --force               Force regeneration of cache.\n"
 		 "        --help                Show this information and exit.\n"
 		 "        --version             Output version information and exit.\n"
 		 "\n"
-		 "hald-cache is a tool to generate binary cache from FDI files.\n"
+		 "hald-generate-fdi-cache is a tool to generate binary cache from FDI files.\n"
 		 "\n"
 		 "For more information visit http://freedesktop.org/Software/hal\n"
 		 "\n");
@@ -723,7 +723,6 @@ int main(int argc, char * argv[])
 		int option_index = 0;
 		const char *opt;
 		static struct option long_options[] = {
-			{"exit-after-probing", 0, NULL, 0},
 			{"help", 0, NULL, 0},
 			{"version", 0, NULL, 0},
 			{"force", 0, NULL, 0},