patch-2.4.23 linux-2.4.23/drivers/net/e1000/e1000_osdep.h

Next file: linux-2.4.23/drivers/net/e1000/e1000_param.c
Previous file: linux-2.4.23/drivers/net/e1000/e1000_main.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.22/drivers/net/e1000/e1000_osdep.h linux-2.4.23/drivers/net/e1000/e1000_osdep.h
@@ -55,11 +55,12 @@
 #define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
 
 typedef enum {
+#undef FALSE
     FALSE = 0,
+#undef TRUE
     TRUE = 1
 } boolean_t;
 
-#define ASSERT(x)	if(!(x)) BUG()
 #define MSGOUT(S, A, B)	printk(KERN_DEBUG S "\n", A, B)
 
 #if DBG

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)