Date: Mon, 14 Jun 2010 16:36:49 GMT From: Alexandre Fiveg <afiveg@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 179607 for review Message-ID: <201006141636.o5EGanSe039384@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@179607?ac=10 Change 179607 by afiveg@cottonmouth on 2010/06/14 16:36:29 refresh em/Makefile Affected files ... .. //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#7 integrate Differences ... ==== //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#7 (text+ko) ==== @@ -1,25 +1,10 @@ # $FreeBSD: src/sys/modules/em/Makefile,v 1.16 2010/03/29 23:36:34 jfv Exp $ .PATH: ${.CURDIR}/../../dev/e1000 - -.if defined(KERNEL_RINGMAP) -KMOD = if_ringmap -.else KMOD = if_em -.endif - SRCS = device_if.h bus_if.h pci_if.h opt_inet.h SRCS += $(CORE_SRC) $(LEGACY_SRC) SRCS += $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED) - -.if defined(KERNEL_RINGMAP) -.PATH: ${.PATH} : ${.CURDIR}/../../net -CFLAGS += -D__RINGMAP__ -D__E1000_RINGMAP__ -SRCS += ringmap.c -.endif - CORE_SRC = if_em.c e1000_osdep.c - - # This is the Legacy, pre-PCIE source, it can be # undefined when using modular driver if not needed LEGACY_SRC += if_lem.c @@ -27,7 +12,7 @@ PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c -CFLAGS += -g -I${.CURDIR}/../../dev/e1000 +CFLAGS += -I${.CURDIR}/../../dev/e1000 # DEVICE_POLLING for a non-interrupt-driven method #CFLAGS += -DDEVICE_POLLING
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006141636.o5EGanSe039384>