Index: stable/9/sys/dev
===================================================================
--- stable/9/sys/dev	(revision 291486)
+++ stable/9/sys/dev	(revision 291487)

Property changes on: stable/9/sys/dev
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/dev:r283679
Index: stable/9/sys/modules/sfxge/Makefile
===================================================================
--- stable/9/sys/modules/sfxge/Makefile	(revision 291486)
+++ stable/9/sys/modules/sfxge/Makefile	(revision 291487)
@@ -1,25 +1,26 @@
 # $FreeBSD$
 
 KMOD=	sfxge
 
 SFXGE= ${.CURDIR}/../../dev/sfxge
 
 SRCS=	device_if.h bus_if.h pci_if.h
 SRCS+=	opt_inet.h opt_zero.h opt_sched.h
 
 .PATH: ${.CURDIR}/../../dev/sfxge
 SRCS+=	sfxge.c sfxge_dma.c sfxge_ev.c
 SRCS+=	sfxge_intr.c sfxge_mcdi.c
 SRCS+=	sfxge_port.c sfxge_rx.c sfxge_tx.c
 
 .PATH: ${.CURDIR}/../../dev/sfxge/common
 SRCS+=	efx_ev.c efx_intr.c efx_mac.c efx_mcdi.c efx_nic.c 
 SRCS+=	efx_nvram.c efx_phy.c efx_port.c efx_rx.c efx_sram.c efx_tx.c
 SRCS+=	efx_vpd.c efx_wol.c
 
 SRCS+=	siena_mac.c siena_nic.c siena_nvram.c siena_phy.c
 SRCS+=	siena_sram.c siena_vpd.c 
 
-DEBUG_FLAGS= -g -DDEBUG=1
+# Extra debug checks
+#CFLAGS += -DDEBUG=1
 
 .include <bsd.kmod.mk>
Index: stable/9/sys/modules
===================================================================
--- stable/9/sys/modules	(revision 291486)
+++ stable/9/sys/modules	(revision 291487)

Property changes on: stable/9/sys/modules
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/modules:r283679
Index: stable/9/sys
===================================================================
--- stable/9/sys	(revision 291486)
+++ stable/9/sys	(revision 291487)

Property changes on: stable/9/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys:r283679