PERFORCE change 96190 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=96190

Change 96190 by marcel at 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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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);