Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp

[linux-2.6] / drivers / net / skge.h

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index f1680beb8e68a903d22228755bc84526656d4b1e..efbf98c675d2d5823acaf26fc9021e9de551b3f4 100644 (file)
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2008,7 +2008,7 @@ enum {
        GM_IS_RX_FF_OR  = 1<<1, /* Receive FIFO Overrun */
        GM_IS_RX_COMPL  = 1<<0, /* Frame Reception Complete */
 
-#define GMAC_DEF_MSK   (GM_IS_TX_CO_OV | GM_IS_RX_CO_OV | GM_IS_TX_FF_UR)
+#define GMAC_DEF_MSK   (GM_IS_RX_FF_OR | GM_IS_TX_FF_UR)
 
 /*     GMAC_LINK_CTRL  16 bit  GMAC Link Control Reg (YUKON only) */
                                                /* Bits 15.. 2: reserved */