From owner-cvs-all  Sat May 12  1:58:15 2001
Delivered-To: cvs-all@freebsd.org
Received: from zibbi.icomtek.csir.co.za (zibbi.icomtek.csir.co.za [146.64.24.58])
	by hub.freebsd.org (Postfix) with ESMTP
	id 769FB37B423; Sat, 12 May 2001 01:58:04 -0700 (PDT)
	(envelope-from jhay@zibbi.icomtek.csir.co.za)
Received: (from jhay@localhost)
	by zibbi.icomtek.csir.co.za (8.11.1/8.11.1) id f4C8vxx51105;
	Sat, 12 May 2001 10:57:59 +0200 (SAT)
	(envelope-from jhay)
From: John Hay <jhay@icomtek.csir.co.za>
Message-Id: <200105120857.f4C8vxx51105@zibbi.icomtek.csir.co.za>
Subject: Re: cvs commit: src/share/man/man4 nge.4 Makefile src/sys/modules         Makefile src/sys/modules/mii Makefile src/sys/modules/nge
In-Reply-To: <200105111956.f4BJueZ54324@freefall.freebsd.org> from Bill Paul at "May 11, 2001 12:56:40 pm"
To: wpaul@FreeBSD.org (Bill Paul)
Date: Sat, 12 May 2001 10:57:59 +0200 (SAT)
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
X-Mailer: ELM [version 2.4ME+ PL54 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

This breaks make release because it breaks a GENERIC kernel with modules
build. Here is my patch that makes the GEBNERIC kernel build succeed. I
don't know about the release yet. It takes a few hours on my machine.

> wpaul       2001/05/11 12:56:39 PDT
> 
>   Modified files:
>     share/man/man4       Makefile 
>     sys/modules          Makefile 
>     sys/modules/mii      Makefile 
>     sys/dev/mii          miidevs 
>     release/texts        HARDWARE.TXT 
>     release/texts/alpha  RELNOTES.TXT 
>     release/texts/i386   RELNOTES.TXT 
>     usr.sbin/sysinstall  devices.c 
>     sys/i386/conf        NOTES 
>     sys/conf             files 
>   Added files:
>     share/man/man4       nge.4 
>     sys/modules/nge      Makefile 
>     sys/dev/mii          nsgphy.c nsgphyreg.h 
>     sys/dev/nge          if_nge.c if_ngereg.h 
>   Log:
>   Add support for gigabit ethernet cards based on the NatSemi DP83820
>   and DP83821 gigabit ethernet MAC chips and the NatSemi DP83861 10/100/1000
...

John
-- 
John Hay -- John.Hay@icomtek.csir.co.za


Index: sys/modules/nge/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/nge/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/modules/nge/Makefile	2001/05/11 19:56:36	1.1
+++ sys/modules/nge/Makefile	2001/05/12 08:15:03
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/nge
 
 KMOD=	if_nge
-SRCS=	if_nge.c opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
+SRCS=	if_nge.c opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h miibus_if.h
 CLEANFILES=	vlan.h
 
 vlan.h:
Index: sys/dev/nge/if_nge.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/nge/if_nge.c,v
retrieving revision 1.2
diff -u -r1.2 if_nge.c
--- sys/dev/nge/if_nge.c	2001/05/11 20:55:31	1.2
+++ sys/dev/nge/if_nge.c	2001/05/12 08:20:49
@@ -116,7 +116,7 @@
 
 #define NGE_USEIOSPACE
 
-#include <pci/if_ngereg.h>
+#include <dev/nge/if_ngereg.h>
 
 MODULE_DEPEND(nge, miibus, 1, 1, 1);
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message