[src/netbsd-6]: src/sys/arch/evbarm/marvell Pull up following revision(s) (re...

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

details:   https://anonhg.NetBSD.org/src/rev/fbf9221c6300
branches:  netbsd-6
changeset: 774263:fbf9221c6300
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Jun 28 04:50:38 2012 +0000

description:
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.

diffstat:

 sys/arch/evbarm/marvell/marvell_machdep.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 2fe320b12d56 -r fbf9221c6300 sys/arch/evbarm/marvell/marvell_machdep.c
--- a/sys/arch/evbarm/marvell/marvell_machdep.c Thu Jun 28 04:48:25 2012 +0000
+++ b/sys/arch/evbarm/marvell/marvell_machdep.c Thu Jun 28 04:50:38 2012 +0000
@@ -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 @@
                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;