From 54f12c977cbe82c0a95b797c6c9971492a8e3df7 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sat, 4 Mar 2006 13:00:56 +0000
Subject: Do not redefine locally SET/CLR/ISSET macros from <sys/param.h>; no
 functional change.

---
 sys/dev/sbus/magmareg.h | 9 +--------
 sys/dev/sbus/spif.c     | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/sys/dev/sbus/magmareg.h b/sys/dev/sbus/magmareg.h
index edc9073abd2..77d806b544d 100644
--- a/sys/dev/sbus/magmareg.h
+++ b/sys/dev/sbus/magmareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magmareg.h,v 1.7 2003/03/27 17:39:05 jason Exp $	*/
+/*	$OpenBSD: magmareg.h,v 1.8 2006/03/04 13:00:55 miod Exp $	*/
 
 /* magmareg.h
  *
@@ -201,13 +201,6 @@ struct mbpp_softc {
 	struct mbpp_port ms_port[MAGMA_MAX_BPP];
 };
 
-/*
- * useful macros
- */
-#define SET(t, f)	((t) |= (f))
-#define CLR(t, f)	((t) &= ~(f))
-#define ISSET(t, f)	((t) & (f))
-
 /* internal function prototypes */
 
 int cd1400_compute_baud(speed_t, int, int *, int *);
diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c
index b83cf859451..830180322ad 100644
--- a/sys/dev/sbus/spif.c
+++ b/sys/dev/sbus/spif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $	*/
+/*	$OpenBSD: spif.c,v 1.13 2006/03/04 13:00:55 miod Exp $	*/
 
 /*
  * Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
@@ -56,13 +56,6 @@
 #include <dev/sbus/spifreg.h>
 #include <dev/sbus/spifvar.h>
 
-/*
- * useful macros
- */
-#define	SET(t, f)	((t) |= (f))
-#define	CLR(t, f)	((t) &= ~(f))
-#define	ISSET(t, f)	((t) & (f))
-
 int	spifmatch(struct device *, void *, void *);
 void	spifattach(struct device *, struct device *, void *);
 
-- 
cgit v1.2.3