7 files changed, 0 insertions, 24 deletions

diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 7d3ec52f56d6..d8a35abfe3f9 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -1170,8 +1170,6 @@ adv_period_offset_to_sdtr(struct adv_softc *adv, u_int *period,
 		period = &dummy_period;
 	}
 
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-
 	*offset = MIN(ADV_SYN_MAX_OFFSET, *offset);
 	if (*period != 0 && *offset != 0) {
 		for (i = 0; i < adv->sdtr_period_tbl_size; i++) {
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 91d2c7d44639..50074131d359 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -72,8 +72,6 @@
 #define ccb_acb_ptr spriv_ptr0
 #define ccb_adw_ptr spriv_ptr1
 
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-
 u_long adw_unit;
 
 static __inline cam_status	adwccbstatus(union ccb*);
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index b4dc58b7ab41..4ba7cea2b183 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -84,10 +84,6 @@
  */
 #define PROBABLY_NEW_BOARD(REV) (REV > 0x43 && REV < 0x56)
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
 /* MailBox Management functions */
 static __inline void	ahanextinbox(struct aha_softc *aha);
 static __inline void	ahanextoutbox(struct aha_softc *aha);
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 740d626036c1..ec5d1381fc65 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -55,8 +55,6 @@
 #define ccb_ecb_ptr spriv_ptr0
 #define ccb_ahb_ptr spriv_ptr1
 
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
 #define ahb_inb(ahb, port)				\
 	bus_space_read_1((ahb)->tag, (ahb)->bsh, port)
 
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 7bb301074556..b7bc725bbb5d 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -72,10 +72,6 @@
  
 #include <dev/buslogic/btreg.h>
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
 /* MailBox Management functions */
 static __inline void	btnextinbox(struct bt_softc *bt);
 static __inline void	btnextoutbox(struct bt_softc *bt);
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index e34a1621a8ed..6018ec2603de 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -50,9 +50,6 @@ SND_DECLARE_FILE("$FreeBSD$");
 
 /* Misc */
 
-#define MIN(x,y) (x) < (y) ? (x) : (y)
-#define MAX(x,y) (x) > (y) ? (x) : (y)
-
 #define inline __inline
 
 #ifndef DEB
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 689ce89d696d..fc52a6b87c97 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -398,13 +398,6 @@ static __inline struct sym_quehead *sym_remque_tail(struct sym_quehead *head)
 #define MAX_QUEUE	SYM_CONF_MAX_QUEUE
 
 /*
- *  These ones should have been already defined.
- */
-#ifndef MIN
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-
-/*
  *  Active debugging tags and verbosity.
  */
 #define DEBUG_ALLOC	(0x0001)