Module Name: src
Committed By: riastradh
Date: Wed Jan 29 19:48:14 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_pci.c
Log Message:
Make i915drm_match return 6 to beat genfb_pci no matter what.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 \
src/sys/external/bsd/drm2/i915drm/i915_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/i915drm/i915_pci.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.11 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.12
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.1.2.11 Wed Jan 29 19:47:38 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Wed Jan 29 19:48:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.1.2.11 2014/01/29 19:47:38 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.1.2.12 2014/01/29 19:48:14 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.1.2.11 2014/01/29 19:47:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.1.2.12 2014/01/29 19:48:14 riastradh Exp $");
#include <sys/types.h>
#ifndef _MODULE
@@ -139,7 +139,10 @@ i915drm_match(device_t parent, cfdata_t
return 0;
#endif
- return (i915drm_pci_lookup(pa) != NULL);
+ if (i915drm_pci_lookup(pa) == NULL)
+ return 0;
+
+ return 6; /* XXX Beat genfb_pci... */
}
static void
