[src/netbsd-7]: src/sys/arch/next68k/stand/boot Pull up following revision(s)...

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

details:   https://anonhg.NetBSD.org/src/rev/f870a98c606d
branches:  netbsd-7
changeset: 798944:f870a98c606d
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Feb 04 06:56:10 2015 +0000

description:
Pull up following revision(s) (requested by chs in ticket #485):
        sys/arch/next68k/stand/boot/en.c: revision 1.18
fix build with gcc48.

diffstat:

 sys/arch/next68k/stand/boot/en.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r 9bcd866f4296 -r f870a98c606d sys/arch/next68k/stand/boot/en.c
--- a/sys/arch/next68k/stand/boot/en.c  Wed Feb 04 06:54:43 2015 +0000
+++ b/sys/arch/next68k/stand/boot/en.c  Wed Feb 04 06:56:10 2015 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: en.c,v 1.17 2009/10/26 19:16:57 cegger Exp $        */
+/*      $NetBSD: en.c,v 1.17.38.1 2015/02/04 06:56:10 snj Exp $        */
 /*
  * Copyright (c) 1996 Rolf Grossmann
  * All rights reserved.
@@ -277,13 +277,17 @@
 {
        volatile struct en_regs *er;
        volatile struct dma_dev *rxdma;
+#if 0
        volatile struct dma_dev *txdma;
+#endif
        int state, rxs;
        size_t rlen;
        char *gotpkt;
 
        rxdma = (struct dma_dev *)P_ENETR_CSR;
+#if 0
        txdma = (struct dma_dev *)P_ENETX_CSR;
+#endif
        er = (struct en_regs *)P_ENET;
 
        DPRINTF(("en_get: rxdma->dd_csr = %x\n",rxdma->dd_csr));