---

yaml --- r: 281960 b: refs/heads/master c: 77e1e43 h: refs/heads/master v: v3
git-mirror · Jan 7, 2012 · 3ea316c · 3ea316c
1 parent 8d7e659
commit 3ea316c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3f511e1ce6f1a6f0a5bb8320e9f802e76f6b999
+refs/heads/master: 77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75
diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c
@@ -1160,7 +1160,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 	lp->dev = dev;
 
 	/* Init RDC private data */
-	lp->mcr0 = MCR0_XMTEN | MCR0;
+	lp->mcr0 = MCR0_XMTEN | MCR0_RCVEN;
 
 	/* The RDC-specific entries in the device structure. */
 	dev->netdev_ops = &r6040_netdev_ops;