Module Name: src
Committed By: riz
Date: Thu Jun 28 04:50:38 UTC 2012
Modified Files:
src/sys/arch/evbarm/marvell [netbsd-6]: marvell_machdep.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #359):
sys/arch/evbarm/marvell/marvell_machdep.c: revision 1.7
Make this compile NMVPEX > 0 && !ORION && KIRKWOOD.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/evbarm/marvell/marvell_machdep.c
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/marvell/marvell_machdep.c
diff -u src/sys/arch/evbarm/marvell/marvell_machdep.c:1.6 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.6.2.1
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.6 Fri Jan 27 15:28:32 2012
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c Thu Jun 28 04:50:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_machdep.c,v 1.6 2012/01/27 15:28:32 jakllsch Exp $ */
+/* $NetBSD: marvell_machdep.c,v 1.6.2.1 2012/06/28 04:50:38 riz Exp $ */
/*
* Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.6 2012/01/27 15:28:32 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.6.2.1 2012/06/28 04:50:38 riz Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
@@ -913,10 +913,14 @@ marvell_device_register(device_t dev, vo
extern struct bus_space
kirkwood_pex_io_bs_tag, kirkwood_pex_mem_bs_tag;
#endif
- extern struct arm32_pci_chipset
- arm32_mvpex0_chipset, arm32_mvpex1_chipset;
+ extern struct arm32_pci_chipset arm32_mvpex0_chipset;
+#ifdef ORION
+ extern struct arm32_pci_chipset arm32_mvpex1_chipset;
+#endif
+#ifdef ORION
struct marvell_attach_args *mva = aux;
+#endif
struct bus_space *mvpex_io_bs_tag, *mvpex_mem_bs_tag;
struct arm32_pci_chipset *arm32_mvpex_chipset;
prop_data_t io_bs_tag, mem_bs_tag, pc;
