From 8692808d00ff1abe10dffb15f3ce3604fa52edf8 Mon Sep 17 00:00:00 2001
From: krw <krw@openbsd.org>
Date: Thu, 31 Mar 2022 14:44:49 +0000
Subject: [PATCH] Remove duplicate scsi devices.

ok miod@ deraadt@
---
 sys/arch/arm64/conf/GENERIC | 9 +--------
 sys/arch/arm64/conf/RAMDISK | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index 3441f8bfa20..170adab7fc7 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.227 2022/03/26 14:25:14 stsp Exp $
+# $OpenBSD: GENERIC,v 1.228 2022/03/31 14:44:49 krw Exp $
 #
 # GENERIC machine description file
 #
@@ -483,13 +483,6 @@ rlphy*		at mii?			# Realtek 8139 internal PHYs
 ukphy*		at mii?			# "unknown" PHYs
 urlphy*		at mii?			# Realtek RTL8150L internal PHY
 
-scsibus*	at scsi?
-sd*		at scsibus?
-cd*		at scsibus?
-st*		at scsibus?
-ch*		at scsibus?
-uk*		at scsibus?
-
 # I2C devices
 abcrtc*		at iic?			# Abracon x80x RTC
 axppmic*	at iic?			# AXP80x PMIC
diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index 8cda41b1da0..ea3ee10fed9 100644
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.170 2022/03/26 14:25:14 stsp Exp $
+# $OpenBSD: RAMDISK,v 1.171 2022/03/31 14:44:49 krw Exp $
 
 machine		arm64
 maxusers	4
@@ -329,13 +329,6 @@ rlphy*		at mii?			# Realtek 8139 internal PHYs
 ukphy*		at mii?			# "unknown" PHYs
 urlphy*		at mii?			# Realtek RTL8150L internal PHY
 
-scsibus*	at scsi?
-sd*		at scsibus?
-cd*		at scsibus?
-st*		at scsibus?
-ch*		at scsibus?
-uk*		at scsibus?
-
 # I2C devices
 abcrtc*		at iic?			# Abracon x80x RTC
 dsxrtc*		at iic?			# DS3231 RTC
-- 
2.20.1