Date: Tue, 16 Dec 2008 04:41:47 GMT From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 154770 for review Message-ID: <200812160441.mBG4fl1V087412@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=154770 Change 154770 by nwhitehorn@nwhitehorn_trantor on 2008/12/16 04:41:46 Fix mismerge. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#7 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/sparc64/pci/ofw_pcibus.c,v 1.21 2008/08/24 15:05:46 marius Exp $"); +__FBSDID("$FreeBSD: head/sys/powerpc/ofw/ofw_pcibus.c 186128 2008-12-15 15:31:10Z nwhitehorn $"); #include <sys/param.h> #include <sys/bus.h> @@ -226,9 +226,6 @@ int s, f, pcifunchigh; uint8_t hdrtype; - KASSERT(dinfo_size >= sizeof(struct pci_devinfo), - ("dinfo_size too small")); - pcib = device_get_parent(dev); maxslots = PCIB_MAXSLOTS(pcib);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812160441.mBG4fl1V087412>