Date: Mon, 14 Jun 2010 21:22:02 GMT From: Alexandre Fiveg <afiveg@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 179622 for review Message-ID: <201006142122.o5ELM24m088500@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@179622?ac=10 Change 179622 by afiveg@cottonmouth on 2010/06/14 21:21:47 continue port to em Affected files ... .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_em.c#5 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_igb.c#4 edit .. //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#8 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#4 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_em.c#5 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_igb.c#4 (text+ko) ==== @@ -272,8 +272,8 @@ static devclass_t igb_devclass; DRIVER_MODULE(igb, pci, igb_driver, igb_devclass, 0, 0); -MODULE_DEPEND(igb, pci, 1, 1, 1); -MODULE_DEPEND(igb, ether, 1, 1, 1); +MODULE_DEPEND(igb, pci, 0, 1, 100); +MODULE_DEPEND(igb, ether, 0, 1, 100); /********************************************************************* * Tunable default values. ==== //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#8 (text+ko) ==== @@ -1,5 +1,10 @@ # $FreeBSD: src/sys/modules/em/Makefile,v 1.16 2010/03/29 23:36:34 jfv Exp $ +.if defined(KERNEL_RINGMAP) +.PATH: ${.CURDIR}/../../dev/e1000 : ${.CURDIR}/../../net +.else .PATH: ${.CURDIR}/../../dev/e1000 +.endif + KMOD = if_em SRCS = device_if.h bus_if.h pci_if.h opt_inet.h SRCS += $(CORE_SRC) $(LEGACY_SRC) ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#4 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006142122.o5ELM24m088500>