From owner-p4-projects@FreeBSD.ORG  Mon Jun 14 16:36:50 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 037251065670; Mon, 14 Jun 2010 16:36:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86B5B106567E
	for <perforce@FreeBSD.org>; Mon, 14 Jun 2010 16:36:49 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 756F68FC14
	for <perforce@FreeBSD.org>; Mon, 14 Jun 2010 16:36:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5EGank4039386
	for <perforce@FreeBSD.org>; Mon, 14 Jun 2010 16:36:49 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5EGanSe039384
	for perforce@freebsd.org; Mon, 14 Jun 2010 16:36:49 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Mon, 14 Jun 2010 16:36:49 GMT
Message-Id: <201006141636.o5EGanSe039384@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg <afiveg@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179607 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jun 2010 16:36:50 -0000

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