[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Remove duplicate declara...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2c119064d0c8
branches:  trunk
changeset: 1028547:2c119064d0c8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:17:52 2021 +0000

description:
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 <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (31 lines):

diff -r ab1be5e09e0b -r 2c119064d0c8 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:17:44 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:17:52 2021 +0000
@@ -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 @@
        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)
 {