git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
char
/
rocket_int.h
diff --git
a/drivers/char/rocket_int.h
b/drivers/char/rocket_int.h
index
9380ff5
..
8026872
100644
(file)
--- a/
drivers/char/rocket_int.h
+++ b/
drivers/char/rocket_int.h
@@
-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