summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2005-01-04 14:13:07 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2005-01-04 14:13:07 +0000
commit5e41b17c23f8bc3f3bfdc27fa606b9392a80ef25 (patch)
treec0734db30ae158996356226da34158608c57fd1c
parent4933b5b254052b0a335128f426a5d241bc5e766a (diff)
cleaner pci/fcom arm cats vs zaurus config.
-rw-r--r--sys/arch/arm/arm/conf.c6
-rw-r--r--sys/arch/cats/include/conf.h5
-rw-r--r--sys/arch/zaurus/conf/files.zaurus6
-rw-r--r--sys/arch/zaurus/include/conf.h4
4 files changed, 9 insertions, 12 deletions
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index bc3d7b1ffc5..e4fa290a538 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.7 2005/01/03 21:25:44 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.8 2005/01/04 14:13:06 drahn Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -142,7 +142,11 @@ cdev_decl(wskbd);
cdev_decl(wsmouse);
#include "lpt.h"
+#ifdef CONF_HAVE_FCOM
#include "fcom.h"
+#else
+#define NFCOM 0
+#endif
#include "radio.h"
cdev_decl(radio);
diff --git a/sys/arch/cats/include/conf.h b/sys/arch/cats/include/conf.h
index 0e2e895431c..77d49b1825b 100644
--- a/sys/arch/cats/include/conf.h
+++ b/sys/arch/cats/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.1 2004/02/01 05:12:54 drahn Exp $ */
+/* $OpenBSD: conf.h,v 1.2 2005/01/04 14:13:06 drahn Exp $ */
/* $NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $ */
#ifndef _CATS_CONF_H
@@ -7,12 +7,11 @@
/*
* CATS specific device includes go in here
*/
-#include "fcom.h"
-
#define CONF_HAVE_PCI
#define CONF_HAVE_USB
#define CONF_HAVE_SCSIPI
#define CONF_HAVE_WSCONS
+#define CONF_HAVE_FCOM
#include <arm/conf.h>
diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus
index 4a99dc79137..52582ce93c6 100644
--- a/sys/arch/zaurus/conf/files.zaurus
+++ b/sys/arch/zaurus/conf/files.zaurus
@@ -66,12 +66,8 @@ include "dev/wsfont/files.wsfont"
include "dev/pckbc/files.pckbc"
-# kludge, not present on zaurus, but needed for arm/conf.c
-device fcom: tty, bus_space_generic
-file arch/arm/footbridge/footbridge_com.c fcom needs-flag
-
# Include USB stuff
include "dev/usb/files.usb"
# Media Independent Interface (mii)
-include "../../../dev/mii/files.mii"
+include "dev/mii/files.mii"
diff --git a/sys/arch/zaurus/include/conf.h b/sys/arch/zaurus/include/conf.h
index 96229125cc1..aa820d703cc 100644
--- a/sys/arch/zaurus/include/conf.h
+++ b/sys/arch/zaurus/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.3 2005/01/04 08:57:44 miod Exp $ */
+/* $OpenBSD: conf.h,v 1.4 2005/01/04 14:13:06 drahn Exp $ */
/* $NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $ */
#ifndef _ZAURUS_CONF_H
@@ -7,10 +7,8 @@
/*
* ZAURUS specific device includes go in here
*/
-#include "fcom.h"
#define CONF_HAVE_USB
-#define CONF_HAVE_SCSIPI
#define CONF_HAVE_WSCONS
#include <arm/conf.h>