evbarm build failing

[Dennis Ferguson <dennis.c.ferguson%gmail.com@localhost>]

An evbarm build from a -current updated about two hours
ago is failing like this:

#   compile  BEAGLEBOARD_INSTALL/nand_bbt.o
[...]
/usr/src/sys/dev/nand/nand_bbt.c: In function 'nand_bbt_block_mark':
/usr/src/sys/dev/nand/nand_bbt.c:207:2: error: 'chip' undeclared (first use in 
this function)
/usr/src/sys/dev/nand/nand_bbt.c:207:2: note: each undeclared identifier is 
reported only once for each function it appears in
/usr/src/sys/dev/nand/nand_bbt.c: In function 'nand_bbt_block_isbad':
/usr/src/sys/dev/nand/nand_bbt.c:225:2: error: 'chip' undeclared (first use in 
this function)
*** [nand_bbt.o] Error code 1
nbmake[2]: stopped in 
/build/beagle/obj/sys/arch/evbarm/compile/BEAGLEBOARD_INSTALL
1 error
nbmake[2]: stopped in 
/build/beagle/obj/sys/arch/evbarm/compile/BEAGLEBOARD_INSTALL

I think something like this might fix it:

Index: sys/dev/nand/nand_bbt.c
===================================================================
RCS file: /cvsroot/src/sys/dev/nand/nand_bbt.c,v
retrieving revision 1.6
diff -u -r1.6 nand_bbt.c
--- sys/dev/nand/nand_bbt.c     21 Oct 2013 17:47:28 -0000      1.6
+++ sys/dev/nand/nand_bbt.c     21 Oct 2013 22:50:46 -0000
@@ -204,7 +204,7 @@
        struct nand_bbt *bbt = &sc->sc_bbt;
        uint8_t clean;
 
-       KASSERT(block < chip->nc_size / chip->nc_block_size);
+       KASSERT(block < sc->sc_chip.nc_size / sc->sc_chip.nc_block_size);
 
        clean = (~0x03 << ((block % 4) * 2));
        marker = (marker << ((block % 4) * 2));
@@ -222,7 +222,7 @@
        uint8_t byte, marker;
        bool result;
 
-       KASSERT(block < chip->nc_size / chip->nc_block_size);
+       KASSERT(block < sc->sc_chip.nc_size / sc->sc_chip.nc_block_size);
 
        /* get byte containing the 2 bit marker for this block */
        byte = bbt->nbbt_bitmap[block / 4];

Dennis Ferguson