From owner-freebsd-bugs@FreeBSD.ORG Thu Oct 11 21:20:04 2007 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DFF716A46D for ; Thu, 11 Oct 2007 21:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 022FD13C4DB for ; Thu, 11 Oct 2007 21:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9BLK3WC050125 for ; Thu, 11 Oct 2007 21:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9BLK3Jm050119; Thu, 11 Oct 2007 21:20:03 GMT (envelope-from gnats) Resent-Date: Thu, 11 Oct 2007 21:20:03 GMT Resent-Message-Id: <200710112120.l9BLK3Jm050119@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Yeske Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3838416A41B for ; Thu, 11 Oct 2007 21:16:05 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 1975713C46E for ; Thu, 11 Oct 2007 21:16:05 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l9BLG4TW075933 for ; Thu, 11 Oct 2007 21:16:04 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.1/8.14.1/Submit) id l9BLG4ke075932; Thu, 11 Oct 2007 21:16:04 GMT (envelope-from nobody) Message-Id: <200710112116.l9BLG4ke075932@www.freebsd.org> Date: Thu, 11 Oct 2007 21:16:04 GMT From: David Yeske To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: kern/117125: kern.pre.mk has duplicate em include X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Oct 2007 21:20:04 -0000 >Number: 117125 >Category: kern >Synopsis: kern.pre.mk has duplicate em include >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Oct 11 21:20:03 UTC 2007 >Closed-Date: >Last-Modified: >Originator: David Yeske >Release: RELENG_6 >Organization: >Environment: FreeBSD nfs 6.2-STABLE FreeBSD 6.2-STABLE #1: Sun Sep 9 02:01:33 EDT 2007 root@nfs:/usr/obj/usr/src/sys/NFS i386 >Description: There is a duplicate entry for the em driver in kern.pre.mk >How-To-Repeat: >Fix: see attachment Patch attached with submission follows: Index: kern.pre.mk =================================================================== RCS file: /home/ncvs/src/sys/conf/kern.pre.mk,v retrieving revision 1.65.2.5 diff -u -r1.65.2.5 kern.pre.mk --- kern.pre.mk 5 Oct 2007 22:49:06 -0000 1.65.2.5 +++ kern.pre.mk 11 Oct 2007 20:48:16 -0000 @@ -70,9 +70,6 @@ # .. and the same for em INCLUDES+= -I$S/dev/em -# .. and the same for em -INCLUDES+= -I$S/dev/em - CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h .if ${CC} != "icc" >Release-Note: >Audit-Trail: >Unformatted: