From 03f0eed079a73233f2866a57c94b738e0fc46ba1 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@NetBSD.org>
Date: Sun, 8 Apr 2018 13:38:31 +0000
Subject: [PATCH] Remove COM_AWIN option

---
 sys/conf/files   | 4 ++--
 sys/dev/ic/com.c | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 46dae7a173bc..7bd548b5a2ca 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1197 2018/04/08 13:36:37 jmcneill Exp $
+#	$NetBSD: files,v 1.1198 2018/04/08 13:38:31 jmcneill Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20171118
@@ -895,7 +895,7 @@ defflag	opt_com.h		COM_DEBUG
 # XXX In a perfect world, this would be done with attributes
 defflag	opt_com.h		COM_16650 COM_16750
 				COM_HAYESP COM_PXA2X0 COM_AU1X00
-				COM_REGMAP COM_FUNCMAP COM_AWIN
+				COM_REGMAP COM_FUNCMAP
 defparam opt_com.h		COM_TOLERANCE
 device	com { } : tty
 file	dev/ic/com.c			com			needs-flag
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 1516edb6f442..6d7931860814 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.346 2017/12/04 09:55:37 bouyer Exp $ */
+/* $NetBSD: com.c,v 1.347 2018/04/08 13:38:32 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.346 2017/12/04 09:55:37 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.347 2018/04/08 13:38:32 jmcneill Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -400,8 +400,6 @@ com_attach_subr(struct com_softc *sc)
 	sc->sc_type = COM_TYPE_16650;
 #elif defined(COM_16750)
 	sc->sc_type = COM_TYPE_16750;
-#elif defined(COM_AWIN)
-	sc->sc_type = COM_TYPE_SUNXI;
 #elif defined(COM_HAYESP)
 	sc->sc_type = COM_TYPE_HAYESP;
 #elif defined(COM_PXA2X0)