Switch i386 from pccom to com. Welcomed by many.

ok dlg@, jsing@, deraadt@

1 files changed, 1 insertions, 16 deletions

diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index 6380fb73d6f..610dc9bf7a6 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_cardbus.c,v 1.31 2008/02/25 23:10:16 brad Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.32 2008/05/21 18:49:47 kettenis Exp $ */
 /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
 
 /*
@@ -57,17 +57,9 @@
 #include <dev/pcmcia/pcmciareg.h>
 
 #include "com.h"
-#ifdef i386
-#include "pccom.h"
-#endif
 
 #include <dev/ic/comreg.h>
-#if NPCCOM > 0
-#include <i386/isa/pccomvar.h>
-#endif
-#if NCOM > 0
 #include <dev/ic/comvar.h>
-#endif
 #include <dev/ic/ns16550reg.h>
 
 #define	com_lcr		com_cfcr
@@ -100,17 +92,10 @@ struct csdev *com_cardbus_find_csdev(struct cardbus_attach_args *);
 int	com_cardbus_gofigure(struct cardbus_attach_args *,
     struct com_cardbus_softc *);
 
-#if NCOM_CARDBUS
 struct cfattach com_cardbus_ca = {
 	sizeof(struct com_cardbus_softc), com_cardbus_match,
 	com_cardbus_attach, com_cardbus_detach, com_activate
 };
-#elif NPCCOM_CARDBUS
-struct cfattach pccom_cardbus_ca = {
-	sizeof(struct com_cardbus_softc), com_cardbus_match,
-	com_cardbus_attach, com_cardbus_detach, com_activate
-};
-#endif
 
 #define BUG_BROADCOM	0x01