From fb264aa6f008773d0e2d5c2f03e255f48e03e756 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 11 Jun 2024 09:21:32 +0000
Subject: [PATCH] remove drm prototypes duplicating those in sys/conf.h

---
 sys/arch/amd64/amd64/conf.c       | 3 +--
 sys/arch/arm64/arm64/conf.c       | 3 +--
 sys/arch/i386/i386/conf.c         | 3 +--
 sys/arch/loongson/loongson/conf.c | 3 +--
 sys/arch/macppc/macppc/conf.c     | 3 +--
 sys/arch/riscv64/riscv64/conf.c   | 3 +--
 sys/arch/sparc64/sparc64/conf.c   | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index abe5828dcc2..8acf196cefd 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.79 2024/06/11 03:28:42 jsg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.80 2024/06/11 09:21:32 jsg Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -141,7 +141,6 @@ cdev_decl(cztty);
 #include "nvram.h"
 cdev_decl(nvram);
 #include "drm.h"
-cdev_decl(drm);
 #include "viocon.h"
 cdev_decl(viocon);
 
diff --git a/sys/arch/arm64/arm64/conf.c b/sys/arch/arm64/arm64/conf.c
index e730a4b265f..b5a0d2eab42 100644
--- a/sys/arch/arm64/arm64/conf.c
+++ b/sys/arch/arm64/arm64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 2023/03/06 17:20:06 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.23 2024/06/11 09:21:32 jsg Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -100,7 +100,6 @@ cdev_decl(lpt);
 #include "ucom.h"
 #include "radio.h"
 #include "drm.h"
-cdev_decl(drm);
 
 #include "wsdisplay.h"
 #include "wskbd.h"
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 70ba7283d39..f38968a64ac 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.177 2024/06/11 03:28:42 jsg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.178 2024/06/11 09:21:32 jsg Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -140,7 +140,6 @@ cdev_decl(cztty);
 #include "nvram.h"
 cdev_decl(nvram);
 #include "drm.h"
-cdev_decl(drm);
 
 #include "wsdisplay.h"
 #include "wskbd.h"
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index f8f7fcc7170..d26655724f1 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.34 2023/04/13 02:19:05 jsg Exp $ */
+/*	$OpenBSD: conf.c,v 1.35 2024/06/11 09:21:32 jsg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -98,7 +98,6 @@ cdev_decl(fd);
 #include "com.h"
 cdev_decl(com);
 #include "drm.h"
-cdev_decl(drm);
 #include "lpt.h"
 cdev_decl(lpt);
 #include "ch.h"
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 14e7bd95ad6..e6672ff444f 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.76 2024/06/11 06:11:50 jsg Exp $ */
+/*	$OpenBSD: conf.c,v 1.77 2024/06/11 09:21:32 jsg Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -102,7 +102,6 @@ cdev_decl(com);
 
 #include "apm.h"
 #include "drm.h"
-cdev_decl(drm);
 
 #include "wsmux.h"
 
diff --git a/sys/arch/riscv64/riscv64/conf.c b/sys/arch/riscv64/riscv64/conf.c
index cf748881f2e..b975aeb9a70 100644
--- a/sys/arch/riscv64/riscv64/conf.c
+++ b/sys/arch/riscv64/riscv64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.17 2023/03/06 17:20:06 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.18 2024/06/11 09:21:32 jsg Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -97,7 +97,6 @@ cdev_decl(lpt);
 #include "ucom.h"
 #include "radio.h"
 #include "drm.h"
-cdev_decl(drm);
 
 #include "wsdisplay.h"
 #include "wskbd.h"
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index f6fa9ba9cb3..dc1ca5247f7 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.89 2024/03/29 21:17:13 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.90 2024/06/11 09:21:32 jsg Exp $	*/
 /*	$NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
 
 /*
@@ -84,7 +84,6 @@
 #include "fdc.h"		/* has NFDC and NFD; see files.sparc64 */
 
 #include "drm.h"
-cdev_decl(drm);
 
 #include "wsdisplay.h"
 #include "wskbd.h"
-- 
2.20.1