vserver 2.0 rc7

[linux-2.6.git] / drivers / char / ipmi / ipmi_bt_sm.c

diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c
index 622456a..5ce9c62 100644 (file)
--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
@@ -31,7 +31,7 @@
 #include <linux/ipmi_msgdefs.h>                /* for completion codes */
 #include "ipmi_si_sm.h"
 
-#define IPMI_BT_VERSION "v31"
+#define IPMI_BT_VERSION "v33"
 
 static int bt_debug = 0x00;    /* Production value 0, see following flags */
 
@@ -235,7 +235,6 @@ static void reset_flags(struct si_sm_data *bt)
        if (BT_STATUS & BT_B_BUSY) BT_CONTROL(BT_B_BUSY);
        BT_CONTROL(BT_CLR_WR_PTR);
        BT_CONTROL(BT_SMS_ATN);
-       BT_INTMASK_W(BT_BMC_HWRST);
 #ifdef DEVELOPMENT_ONLY_NOT_FOR_PRODUCTION
        if (BT_STATUS & BT_B2H_ATN) {
                int i;
@@ -445,7 +444,7 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
 
        case BT_STATE_RESET1:
                reset_flags(bt);
-               bt->timeout = BT_RESET_DELAY;;
+               bt->timeout = BT_RESET_DELAY;
                bt->state = BT_STATE_RESET2;
                break;