From 006fdec1604c712c602f0bd6c198acf303a5b975 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 10 Mar 2010 00:10:46 -0500 Subject: [PATCH] --- yaml --- r: 189131 b: refs/heads/master c: 05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590 h: refs/heads/master i: 189129: 3564980447eeac70d9f3a83dfaaf2ddb6e1f875b 189127: d13d9992f409274f8ae1ce0b6eece0988828216b v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et1310_mac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15b0f557dfd9..1a4742a8c368 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b72c40949b0f04728f2993a1434598d3bad094ea +refs/heads/master: 05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590 diff --git a/trunk/drivers/staging/et131x/et1310_mac.c b/trunk/drivers/staging/et131x/et1310_mac.c index a292b1edc414..737a9f5401d1 100644 --- a/trunk/drivers/staging/et131x/et1310_mac.c +++ b/trunk/drivers/staging/et131x/et1310_mac.c @@ -226,7 +226,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev) } /* Enable TXMAC */ - ctl |= 0x05; /* TX mac enable, FC disable */ + ctl |= 0x09; /* TX mac enable, FC disable */ writel(ctl, &etdev->regs->txmac.ctl); /* Ready to start the RXDMA/TXDMA engine */