From 0de6f3d4d0bd463a2e523d5f5fcf30e59ed50521 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Wed, 22 Aug 2018 15:38:46 +0000
Subject: [PATCH] Enable uscom(4) where uslcom(4) is already present.

Based on a submisison from Jan Klemkow.
---
 sys/arch/alpha/conf/GENERIC    | 4 +++-
 sys/arch/amd64/conf/GENERIC    | 4 +++-
 sys/arch/arm64/conf/GENERIC    | 4 +++-
 sys/arch/armv7/conf/GENERIC    | 4 +++-
 sys/arch/hppa/conf/GENERIC     | 4 +++-
 sys/arch/i386/conf/GENERIC     | 4 +++-
 sys/arch/landisk/conf/GENERIC  | 4 +++-
 sys/arch/loongson/conf/GENERIC | 4 +++-
 sys/arch/macppc/conf/GENERIC   | 4 +++-
 sys/arch/octeon/conf/GENERIC   | 4 +++-
 sys/arch/sparc64/conf/GENERIC  | 4 +++-
 11 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 01b5e7beaaf..f9439674816 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.261 2017/11/02 14:04:24 mpi Exp $
+#	$OpenBSD: GENERIC,v 1.262 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -80,6 +80,8 @@ umct*	at uhub?			# MCT USB-RS232 serial adapter
 ucom*	at umct?
 uslcom*	at uhub?			# Silicon Laboratories CP210x serial
 ucom*	at uslcom?
+uscom*	at uhub?			# Simple USB serial adapters
+ucom*	at uscom?
 uark*	at uhub?			# Arkmicro ARK3116 serial
 ucom*	at uark?
 uipaq*	at uhub?			# iPAQ serial adapter
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index dc1f1d4f6e9..ba12d68d77d 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.459 2018/08/21 18:06:12 anton Exp $
+#	$OpenBSD: GENERIC,v 1.460 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -230,6 +230,8 @@ umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
 uslcom*	at uhub?		# Silicon Laboratories CP210x serial
 ucom*	at uslcom?
+uscom*	at uhub?		# Simple USB serial adapters
+ucom*	at uscom?
 uark*	at uhub?		# Arkmicro ARK3116 serial
 ucom*	at uark?
 moscom*	at uhub?		# MosChip MCS7703 serial
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index e7476d669fd..928c4c6ce3b 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.82 2018/08/03 13:37:08 kevlo Exp $
+# $OpenBSD: GENERIC,v 1.83 2018/08/22 15:38:46 mpi Exp $
 #
 # GENERIC machine description file
 #
@@ -212,6 +212,8 @@ umct*		at uhub?		# MCT USB-RS232 serial adapter
 ucom*		at umct?
 uslcom*		at uhub?		# Silicon Laboratories CP210x serial
 ucom*		at uslcom?
+uscom*		at uhub?		# Simple USB serial adapters
+ucom*		at uscom?
 uark*		at uhub?		# Arkmicro ARK3116 serial
 ucom*		at uark?
 moscom*		at uhub?		# MosChip MCS7703 serial
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index a0f63970380..b054a3a07ae 100644
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.118 2018/08/05 13:20:58 jsg Exp $
+#	$OpenBSD: GENERIC,v 1.119 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -256,6 +256,8 @@ umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
 uslcom*	at uhub?		# Silicon Laboratories CP210x serial
 ucom*	at uslcom?
+uscom*	at uhub?		# Simple USB serial adapters
+ucom*	at uscom?
 uark*	at uhub?		# Arkmicro ARK3116 serial
 ucom*	at uark?
 moscom*	at uhub?		# MosChip MCS7703 serial
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 4032760472e..a50fb8c7f78 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.176 2018/05/14 13:54:39 kettenis Exp $
+#	$OpenBSD: GENERIC,v 1.177 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -132,6 +132,8 @@ umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
 uslcom*	at uhub?		# Silicon Laboratories CP210x serial
 ucom*	at uslcom?
+uscom*	at uhub?		# Simple USB serial adapters
+ucom*	at uscom?
 uipaq*	at uhub?		# iPAQ serial adapter
 ucom*	at uipaq?
 umsm*	at uhub?		# Qualcomm MSM EVDO
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f1cb367391a..cad3743f484 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.835 2018/08/21 18:06:12 anton Exp $
+#	$OpenBSD: GENERIC,v 1.836 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -246,6 +246,8 @@ umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
 uslcom*	at uhub?		# Silicon Laboratories CP210x serial
 ucom*	at uslcom?
+uscom*	at uhub?		# Simple USB serial adapters
+ucom*	at uscom?
 uark*	at uhub?		# Arkmicro ARK3116 serial
 ucom*	at uark?
 moscom*	at uhub?		# MosChip MCS7703 serial
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index 918c1069614..3129c476618 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.52 2017/08/28 19:32:53 jasper Exp $
+# $OpenBSD: GENERIC,v 1.53 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -104,6 +104,8 @@ umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
 uslcom*	at uhub?		# Silicon Laboratories CP210x serial
 ucom*	at uslcom?
+uscom*	at uhub?		# Simple USB serial adapters
+ucom*	at uscom?
 uark*	at uhub?		# Arkmicro ARK3116 serial
 ucom*	at uark?
 moscom*	at uhub?		# MosChip MCS7703 serial
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index e2becda1af6..69ecfb02667 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.58 2018/05/31 19:31:54 fcambus Exp $
+#	$OpenBSD: GENERIC,v 1.59 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -137,6 +137,8 @@ umct*		at uhub?	# MCT USB-RS232 serial adapter
 ucom*		at umct?
 uslcom*		at uhub?	# Silicon Laboratories CP210x serial
 ucom*		at uslcom?
+uscom*		at uhub?	# Simple USB serial adapters
+ucom*		at uscom?
 uark*		at uhub?	# Arkmicro ARK3116 serial
 ucom*		at uark?
 moscom*		at uhub?	# MosChip MCS7703 serial
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index d0bdc756d59..ac1a154cc25 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.264 2018/02/14 23:51:49 jsg Exp $g
+#	$OpenBSD: GENERIC,v 1.265 2018/08/22 15:38:46 mpi Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -223,6 +223,8 @@ umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
 uslcom*	at uhub?		# Silicon Laboratories CP210x serial
 ucom*	at uslcom?
+uscom*	at uhub?		# Simple USB serial adapters
+ucom*	at uscom?
 uark*	at uhub?		# Arkmicro ARK3116 serial
 ucom*	at uark?
 moscom*	at uhub?		# MosChip MCS7703 serial
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC
index c7c8f3dd84e..6ccb10f2ed7 100644
--- a/sys/arch/octeon/conf/GENERIC
+++ b/sys/arch/octeon/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.43 2018/06/01 17:15:27 visa Exp $
+#	$OpenBSD: GENERIC,v 1.44 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -110,6 +110,8 @@ umct*		at uhub?	# MCT USB-RS232 serial adapter
 ucom*		at umct?
 uslcom*		at uhub?	# Silicon Laboratories CP210x serial
 ucom*		at uslcom?
+uscom*		at uhub?	# Simple USB serial adapters
+ucom*		at uscom?
 uark*		at uhub?	# Arkmicro ARK3116 serial
 ucom*		at uark?
 moscom*		at uhub?	# MosChip MCS7703 serial
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 49be10dcbe2..1f7c283b829 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.307 2017/08/28 19:32:53 jasper Exp $
+#	$OpenBSD: GENERIC,v 1.308 2018/08/22 15:38:46 mpi Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -193,6 +193,8 @@ umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
 uslcom*	at uhub?		# Silicon Laboratories CP210x serial
 ucom*	at uslcom?
+uscom*	at uhub?		# Simple USB serial adapters
+ucom*	at uscom?
 uark*	at uhub?		# Arkmicro ARK3116 serial
 ucom*	at uark?
 uipaq*	at uhub?		# iPAQ serial adapter
-- 
2.20.1