Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:17:52 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
Remove duplicate declaration of i915_device_ids
The one that compiles is in i915_pci.c now. No `pciidlist` in this
file!
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.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/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.29 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.30
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.29 Sun Dec 19 11:17:44 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:17:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.29 2021/12/19 11:17:44 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.30 2021/12/19 11:17:52 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.29 2021/12/19 11:17:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.30 2021/12/19 11:17:52 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -892,12 +892,6 @@ skl_dram_get_channels_info(struct drm_i9
return 0;
}
-#ifdef __NetBSD__
-/* XXX Kludge to expose this to NetBSD driver attachment goop. */
-const struct pci_device_id *const i915_device_ids = pciidlist;
-const size_t i915_n_device_ids = __arraycount(pciidlist);
-#endif
-
static enum intel_dram_type
skl_get_dram_type(struct drm_i915_private *dev_priv)
{
