From owner-p4-projects@FreeBSD.ORG Thu Apr 27 05:02:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4AE516A433; Thu, 27 Apr 2006 05:02:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BEF516A425 for ; Thu, 27 Apr 2006 05:02:40 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D56E43D4C for ; Thu, 27 Apr 2006 05:02:37 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3R52aVT023854 for ; Thu, 27 Apr 2006 05:02:36 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3R52a0k023848 for perforce@freebsd.org; Thu, 27 Apr 2006 05:02:36 GMT (envelope-from marcel@freebsd.org) Date: Thu, 27 Apr 2006 05:02:36 GMT Message-Id: <200604270502.k3R52a0k023848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 96190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Apr 2006 05:02:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=96190 Change 96190 by marcel@marcel_nfs on 2006/04/27 05:02:21 IFC @96189 Affected files ... .. //depot/projects/uart/dev/pci/pci.c#22 integrate .. //depot/projects/uart/dev/sk/if_sk.c#3 integrate Differences ... ==== //depot/projects/uart/dev/pci/pci.c#22 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.310 2006/01/20 22:00:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.311 2006/04/27 04:53:18 marcel Exp $"); #include "opt_bus.h" @@ -860,12 +860,12 @@ * isn't clear, we know we have a BAR that doesn't conform to the * spec, so ignore it. Also, sanity check the size of the data * areas to the type of memory involved. Memory must be at least - * 32 bytes in size, while I/O ranges must be at least 4. + * 16 bytes in size, while I/O ranges must be at least 4. */ if ((testval & 0x1) == 0x1 && (testval & 0x2) != 0) return (barlen); - if ((type == SYS_RES_MEMORY && ln2size < 5) || + if ((type == SYS_RES_MEMORY && ln2size < 4) || (type == SYS_RES_IOPORT && ln2size < 2)) return (barlen); ==== //depot/projects/uart/dev/sk/if_sk.c#3 (text) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.119 2006/04/27 00:14:01 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.120 2006/04/27 04:39:58 yongari Exp $"); /* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports @@ -136,7 +136,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.119 2006/04/27 00:14:01 yongari Exp $"; + "$FreeBSD: src/sys/dev/sk/if_sk.c,v 1.120 2006/04/27 04:39:58 yongari Exp $"; #endif static struct sk_type sk_devs[] = { @@ -312,7 +312,7 @@ static devclass_t sk_devclass; -DRIVER_MODULE(sk, pci, skc_driver, skc_devclass, 0, 0); +DRIVER_MODULE(skc, pci, skc_driver, skc_devclass, 0, 0); DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0); DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0);