kernel build error in dev/igb

Kernel cvsup'ed around 3 AM today.
Build dies in src/sys/dev/igb due to a printf format specifier
conflict between %lu and u64 args.  My patch to workaround
is below.


Index: if_igb.c
===================================================================
RCS file: /opt/FreeBSD/cvs/src/sys/dev/igb/if_igb.c,v
retrieving revision 1.4
diff -u -r1.4 if_igb.c
--- if_igb.c	1 Mar 2008 04:36:24 -0000	1.4
+++ if_igb.c	1 Mar 2008 14:44:18 -0000
_at__at_ -4207,11 +4207,11 _at__at_
  		device_printf(dev, "Queue(%d) tdh = %d, tdt = %d\n", i,
  		    E1000_READ_REG(&adapter->hw, E1000_TDH(i)),
  		    E1000_READ_REG(&adapter->hw, E1000_TDT(i)));
-		device_printf(dev, "no descriptors avail event = %lu\n",
+		device_printf(dev, "no descriptors avail event = %llu\n",
  		    txr->no_desc_avail);
-		device_printf(dev, "TX(%d) IRQ Handled = %lu\n", txr->me,
+		device_printf(dev, "TX(%d) IRQ Handled = %llu\n", txr->me,
  		    txr->tx_irq);
-		device_printf(dev, "TX(%d) Packets sent = %lu\n", txr->me,
+		device_printf(dev, "TX(%d) Packets sent = %llu\n", txr->me,
  		    txr->tx_packets);
  	}

_at__at_ -4219,11 +4219,11 _at__at_
  		device_printf(dev, "Queue(%d) rdh = %d, rdt = %d\n", i,
  		    E1000_READ_REG(&adapter->hw, E1000_RDH(i)),
  		    E1000_READ_REG(&adapter->hw, E1000_RDT(i)));
-		device_printf(dev, "RX(%d) Packets received = %lu\n", rxr->me,
+		device_printf(dev, "RX(%d) Packets received = %llu\n", rxr->me,
  		    rxr->rx_packets);
-		device_printf(dev, "RX(%d) Byte count = %lu\n", rxr->me,
+		device_printf(dev, "RX(%d) Byte count = %llu\n", rxr->me,
  		    rxr->rx_bytes);
-		device_printf(dev, "RX(%d) IRQ Handled = %lu\n", rxr->me,
+		device_printf(dev, "RX(%d) IRQ Handled = %llu\n", rxr->me,
  		    rxr->rx_irq);
  	}
  	device_printf(dev, "LINK IRQ Handled = %u\n", adapter->link_irq);