[src/trunk]: src/sys/arch/evbarm/ixm1200 Make this compile again.

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

details:   https://anonhg.NetBSD.org/src/rev/25eb89dc1556
branches:  trunk
changeset: 780605:25eb89dc1556
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jul 30 23:35:05 2012 +0000

description:
Make this compile again.

diffstat:

 sys/arch/evbarm/ixm1200/nappi_nr.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 464d3ba3c4c0 -r 25eb89dc1556 sys/arch/evbarm/ixm1200/nappi_nr.c
--- a/sys/arch/evbarm/ixm1200/nappi_nr.c        Mon Jul 30 23:04:42 2012 +0000
+++ b/sys/arch/evbarm/ixm1200/nappi_nr.c        Mon Jul 30 23:35:05 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
+/* $NetBSD: nappi_nr.c,v 1.10 2012/07/30 23:35:05 matt Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.10 2012/07/30 23:35:05 matt Exp $");
 
 /*
  * LED support for NAPPI.
@@ -107,8 +107,10 @@
 {
        static const int        ptn[] = { 1, 2, 4, 8, 4, 2 };
        struct nappinr_softc*   sc = arg;
+       uint32_t v;
 
-       bus_space_write_4(sc->sc_iot, sc->sc_ioh, 0,
-                         ptn[sc->sc_pos++ % 6] | ptn[sc->sc_pos++ % 6]<< 4);
+       v = ptn[sc->sc_pos++ % 6];
+       v |= ptn[sc->sc_pos++ % 6] << 4;
+       bus_space_write_4(sc->sc_iot, sc->sc_ioh, 0, v);
        callout_reset(&sc->sc_co, hz / 10, nappinr_callout, sc);
 }