diff --git a/[refs] b/[refs] index 16f339ddb0cd..2b6a9bb40ffb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6892914fb7980d844f2bac859f4095df9ebd18da +refs/heads/master: 15f5a585c6b8dac31ed0a55693aacf51934f0f5d diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 3a7cfb81bf89..8bc28b14c70f 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -533,8 +533,6 @@ static inline unsigned int tg3_has_work(struct tg3 *tp) */ static void tg3_restart_ints(struct tg3 *tp) { - tw32(TG3PCI_MISC_HOST_CTRL, - (tp->misc_host_ctrl & ~MISC_HOST_CTRL_MASK_PCI_INT)); tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, tp->last_tag << 24); mmiowb();