From: Signed-off-by: Maximilian Attems Signed-off-by: Andrew Morton --- 25-akpm/drivers/char/rocket_int.h | 4 ---- 1 files changed, 4 deletions(-) diff -puN drivers/char/rocket_int.h~drivers-char-rocket_inth-min-max-removal drivers/char/rocket_int.h --- 25/drivers/char/rocket_int.h~drivers-char-rocket_inth-min-max-removal Wed Sep 1 15:20:08 2004 +++ 25-akpm/drivers/char/rocket_int.h Wed Sep 1 15:20:08 2004 @@ -1241,10 +1241,6 @@ struct r_port { #define TTY_ROCKET_MAJOR 46 #define CUA_ROCKET_MAJOR 47 -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - #ifdef PCI_VENDOR_ID_RP #undef PCI_VENDOR_ID_RP #undef PCI_DEVICE_ID_RP8OCTA _