From 931c1dcec043e6baac718a94f8731cc31461d4db Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Mon, 30 Jun 2014 09:40:19 +0300
Subject: stdlib: Drop duplicates of min() and max()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib2f6fad735e085d237a0d46e0586e123eef6e0e2
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6161
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
---
 src/northbridge/intel/gm45/raminit.c    | 2 +-
 src/northbridge/intel/nehalem/raminit.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/northbridge')

diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c
index d607f84e10..0636d9f9f2 100644
--- a/src/northbridge/intel/gm45/raminit.c
+++ b/src/northbridge/intel/gm45/raminit.c
@@ -20,6 +20,7 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <arch/cpu.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
@@ -361,7 +362,6 @@ static void collect_ddr3(spdinfo_t *const config)
 	}
 }
 
-#define min(a, b) ((a) < (b))?(a):(b)
 #define ROUNDUP_DIV(val, by) (((val) + (by) - 1) / (by))
 #define ROUNDUP_DIV_THIS(val, by) val = ROUNDUP_DIV(val, by)
 static fsb_clock_t read_fsb_clock(void)
diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c
index 2ddc35caee..761dc527bf 100644
--- a/src/northbridge/intel/nehalem/raminit.c
+++ b/src/northbridge/intel/nehalem/raminit.c
@@ -25,6 +25,7 @@
 #endif
 
 #if REAL
+#include <stdlib.h>
 #include <console/console.h>
 #include <string.h>
 #include <arch/hlt.h>
@@ -571,9 +572,6 @@ static int find_lowest_bit_set32(u32 val)
 	return -1;
 }
 
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-
 enum {
 	DEVICE_TYPE = 2,
 	MODULE_TYPE = 3,
-- 
cgit v1.2.3