From owner-freebsd-current  Thu Mar 29 14: 9:14 2001
Delivered-To: freebsd-current@freebsd.org
Received: from freesbee.wheel.dk (freesbee.wheel.dk [193.162.159.97])
	by hub.freebsd.org (Postfix) with ESMTP
	id 38F3937B718; Thu, 29 Mar 2001 14:09:07 -0800 (PST)
	(envelope-from jesper@skriver.dk)
Received: by freesbee.wheel.dk (Postfix, from userid 1001)
	id E348C5D64; Fri, 30 Mar 2001 00:09:05 +0200 (CEST)
Date: Fri, 30 Mar 2001 00:09:05 +0200
From: Jesper Skriver <jesper@skriver.dk>
To: John Baldwin <jhb@FreeBSD.org>
Cc: current@FreeBSD.org,
	"Niels Chr. Bank-Pedersen" <ncbp@bank-pedersen.dk>
Subject: Re: NEWCARD broken in -current
Message-ID: <20010330000905.B13266@skriver.dk>
References: <20010328231709.A96500@skriver.dk> <XFMail.010329131309.jhb@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <XFMail.010329131309.jhb@FreeBSD.org>; from jhb@FreeBSD.org on Thu, Mar 29, 2001 at 01:13:09PM -0800
X-PGP-Fingerprint: 6B88 9CE8 66E9 E631 C9C5  5EB4 22AB F0EC F956 1C31
X-PGP-Public-Key: http://freesbee.wheel.dk/~jesper/gpgkey.pub
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

On Thu, Mar 29, 2001 at 01:13:09PM -0800, John Baldwin wrote:
> > 
> > Index: src/sys/dev/pccbb/pccbb.c
> > ===================================================================
> > RCS file: /home/ncvs/src/sys/dev/pccbb/pccbb.c,v
> > retrieving revision 1.12
> > diff -u -r1.12 pccbb.c
> > --- src/sys/dev/pccbb/pccbb.c 2001/02/09 06:08:52     1.12
> > +++ src/sys/dev/pccbb/pccbb.c 2001/03/28 20:51:20
> > @@ -53,6 +53,8 @@
> >  #include <sys/kernel.h>
> >  #include <sys/kthread.h>
> >  #include <sys/malloc.h>
> > +#include <sys/types.h>
> > +#include <sys/lock.h>
> >  #include <sys/mutex.h>
> >  
> >  #include <sys/bus.h>
> 
> Please sort the includes or at least attempt to as that is style(9).  You'll
> need to mvoe lock.h up before malloc.h.  types.h is special, it belongs as the
> very first header unless sys/param.h is the first header (param.h includes
> types.h).

The above was committed, so would the below fix it right ?

Index: src/sys/dev/pccbb/pccbb.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pccbb/pccbb.c,v
retrieving revision 1.13
diff -u -r1.13 pccbb.c
--- src/sys/dev/pccbb/pccbb.c   2001/03/29 10:23:45     1.13
+++ src/sys/dev/pccbb/pccbb.c   2001/03/29 22:06:51
@@ -52,9 +52,8 @@
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
-#include <sys/malloc.h>
-#include <sys/types.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 
 #include <sys/bus.h>


/Jesper

-- 
Jesper Skriver, jesper(at)skriver(dot)dk  -  CCIE #5456
Work:    Network manager   @ AS3292 (Tele Danmark DataNetworks)
Private: FreeBSD committer @ AS2109 (A much smaller network ;-)

One Unix to rule them all, One Resolver to find them,
One IP to bring them all and in the zone to bind them.

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