summaryrefslogtreecommitdiff
path: root/sys/arch/alpha
diff options
context:
space:
mode:
authorNiels Provos <provos@cvs.openbsd.org>2000-06-16 21:47:20 +0000
committerNiels Provos <provos@cvs.openbsd.org>2000-06-16 21:47:20 +0000
commit73501d656ca05164437c542734297118885750b9 (patch)
tree67425e428d72378b157a1a44f8f1839fddf27877 /sys/arch/alpha
parent5042942398fd5fe3553c7eb71e912f3412f22eb5 (diff)
take MIN/MAX from param.h, okay theo@
Diffstat (limited to 'sys/arch/alpha')
-rw-r--r--sys/arch/alpha/pci/pcs_bus_io_common.c4
-rw-r--r--sys/arch/alpha/pci/pcs_bus_mem_common.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/arch/alpha/pci/pcs_bus_io_common.c b/sys/arch/alpha/pci/pcs_bus_io_common.c
index 6d07d684a79..1ab25324fcf 100644
--- a/sys/arch/alpha/pci/pcs_bus_io_common.c
+++ b/sys/arch/alpha/pci/pcs_bus_io_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcs_bus_io_common.c,v 1.8 1997/07/07 07:15:41 niklas Exp $ */
+/* $OpenBSD: pcs_bus_io_common.c,v 1.9 2000/06/16 21:47:09 provos Exp $ */
/* $NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $ */
/*
@@ -42,8 +42,6 @@
#define __C(A,B) __CONCAT(A,B)
#define __S(S) __STRING(S)
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-
/* mapping/unmapping */
int __C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *));
diff --git a/sys/arch/alpha/pci/pcs_bus_mem_common.c b/sys/arch/alpha/pci/pcs_bus_mem_common.c
index ac6a817b57d..8105285795b 100644
--- a/sys/arch/alpha/pci/pcs_bus_mem_common.c
+++ b/sys/arch/alpha/pci/pcs_bus_mem_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcs_bus_mem_common.c,v 1.8 1997/07/19 20:44:15 niklas Exp $ */
+/* $OpenBSD: pcs_bus_mem_common.c,v 1.9 2000/06/16 21:47:10 provos Exp $ */
/* $NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $ */
/*
@@ -43,8 +43,6 @@
#define __C(A,B) __CONCAT(A,B)
#define __S(S) __STRING(S)
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-
/* mapping/unmapping */
int __C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *));