Pull sony-2.6.24 into release branch

[linux-2.6-omap-h63xx.git] / drivers / net / s2io-regs.h

diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 4cb710bbe72909ff3f010ea850e240823c942a20..cfa267914476158a9cea058e203f3e5881f46925 100644 (file)
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -747,10 +747,9 @@ struct XENA_dev_config {
 #define MC_ERR_REG_MIRI_CRI_ERR_1          BIT(23)
 #define MC_ERR_REG_SM_ERR                  BIT(31)
 #define MC_ERR_REG_ECC_ALL_SNG            (BIT(2) | BIT(3) | BIT(4) | BIT(5) |\
-                                           BIT(6) | BIT(7) | BIT(17) | BIT(19))
+                                       BIT(17) | BIT(19))
 #define MC_ERR_REG_ECC_ALL_DBL            (BIT(10) | BIT(11) | BIT(12) |\
-                                           BIT(13) | BIT(14) | BIT(15) |\
-                                           BIT(18) | BIT(20))
+                                       BIT(13) | BIT(18) | BIT(20))
        u64 mc_err_mask;
        u64 mc_err_alarm;