[src/netbsd-7]: src/sys/arch/zaurus/include Pull up following revision(s) (re...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1436593a74fc
branches:  netbsd-7
changeset: 799154:1436593a74fc
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 26 16:14:46 2015 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #645):
        sys/arch/zaurus/include/bootconfig.h: revision 1.2
merge common information (fix build)

diffstat:

 sys/arch/zaurus/include/bootconfig.h |  19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diffs (40 lines):

diff -r 3682895f1b54 -r 1436593a74fc sys/arch/zaurus/include/bootconfig.h
--- a/sys/arch/zaurus/include/bootconfig.h      Thu Mar 26 16:09:52 2015 +0000
+++ b/sys/arch/zaurus/include/bootconfig.h      Thu Mar 26 16:14:46 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootconfig.h,v 1.1 2006/12/16 05:43:15 ober Exp $      */
+/*     $NetBSD: bootconfig.h,v 1.1.116.1 2015/03/26 16:14:46 martin Exp $      */
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -41,6 +41,10 @@
  *
  * Based on kate/boot/bootconfig.h
  */
+#ifndef _ZAURUS_BOOTCONFIG_H_
+#define _ZAURUS_BOOTCONFIG_H_
+
+#include <arm/bootconfig.h>
 
 typedef struct _PhysMem {
        u_int address;
@@ -59,17 +63,8 @@
 extern BootConfig bootconfig;
 #define        MAX_BOOT_STRING                 255
 
-#define BOOTOPT_TYPE_BOOLEAN           0
-#define BOOTOPT_TYPE_STRING            1
-#define BOOTOPT_TYPE_INT               2
-#define BOOTOPT_TYPE_BININT            3
-#define BOOTOPT_TYPE_HEXINT            4
-#define BOOTOPT_TYPE_MASK              7
-
-int get_bootconf_option(char *, const char *, int, void *);
-
-extern char *boot_args;
 extern char *boot_file;
 #endif /* _KERNEL */
 
-/* End of bootconfig.h */
+#endif /* _ZAURUS_BOOTCONFIG_H_ */
+