[PATCH] drivers/char/selection.c MIN/MAX removal

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index 598f6011050df80df0dae4fa94579c97152f8854..995c675d709c41af024e3fdde9d9cb037f1112d9 100644 (file)
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -26,10 +26,6 @@
 #include <linux/tiocl.h>
 #include <linux/console.h>
 
-#ifndef MIN
-#define MIN(a,b)       ((a) < (b) ? (a) : (b))
-#endif
-
 /* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */
 #define isspace(c)     ((c) == ' ')
 
@@ -295,7 +291,7 @@ int paste_selection(struct tty_struct *tty)
                        continue;
                }
                count = sel_buffer_lth - pasted;
-               count = MIN(count, tty->ldisc.receive_room(tty));
+               count = min(count, tty->ldisc.receive_room(tty));
                tty->ldisc.receive_buf(tty, sel_buffer + pasted, NULL, count);
                pasted += count;
        }