From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Fri, 3 Oct 2014 18:09:20 +0000 (-0400)
Subject: staging: unisys: remove redundant max macro
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38d1fd3d0e2bf9f91e9b018b05c3730a2a454ee8;p=linux-beck.git

staging: unisys: remove redundant max macro

No need to have another max macro when the kernel has one already.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
index 98e8b20a44a0..de11f440e1e3 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -146,10 +146,6 @@
 		schedule_timeout(x);				    \
 	} while (0)
 
-#ifndef max
-#define max(a, b) (((a) > (b)) ? (a) : (b))
-#endif
-
 static inline struct cdev *cdev_alloc_init(struct module *owner,
 					   const struct file_operations *fops)
 {