diff --git a/[refs] b/[refs] index 1e95236ba61a..b5831470d873 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32f565df9ba451a24117db67003ed2ae21bab88c +refs/heads/master: 31718dedf62fd62e807001138ab5ac76e9b11064 diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c index 973f1e81667a..b68781d35928 100644 --- a/trunk/drivers/net/r6040.c +++ b/trunk/drivers/net/r6040.c @@ -388,8 +388,8 @@ static void r6040_init_mac_regs(struct net_device *dev) iowrite16(lp->rx_ring_dma >> 16, ioaddr + MRD_SA1); /* Set interrupt waiting time and packet numbers */ - iowrite16(0x0F06, ioaddr + MT_ICR); - iowrite16(0x0F06, ioaddr + MR_ICR); + iowrite16(0, ioaddr + MT_ICR); + iowrite16(0, ioaddr + MR_ICR); /* Enable interrupts */ iowrite16(INT_MASK, ioaddr + MIER);