Module Name:    src
Committed By:   matt
Date:           Wed Sep  5 00:10:11 UTC 2012

Modified Files:
        src/sys/arch/evbarm/include: autoconf.h

Log Message:
Allow <arm/mainbus/mainbus.h> to supply mainbus_attach_args.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/include/autoconf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbarm/include/autoconf.h
diff -u src/sys/arch/evbarm/include/autoconf.h:1.5 src/sys/arch/evbarm/include/autoconf.h:1.6
--- src/sys/arch/evbarm/include/autoconf.h:1.5	Mon Apr 28 20:23:16 2008
+++ src/sys/arch/evbarm/include/autoconf.h	Wed Sep  5 00:10:11 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.h,v 1.5 2008/04/28 20:23:16 martin Exp $	*/
+/*	$NetBSD: autoconf.h,v 1.6 2012/09/05 00:10:11 matt Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,9 +32,11 @@
 #ifndef _EVBARM_AUTOCONF_H_
 #define	_EVBARM_AUTOCONF_H_
 
+#ifndef _ARM_MAINBUS_MAINBUS_H_
 struct mainbus_attach_args {
 	const char *ma_name;
 };
+#endif
 
 struct device;
 extern void (*evbarm_device_register)(struct device *, void *);

Reply via email to