From 9e968a991f40ba1d7632518c82960397a5fd2159 Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Thu, 6 Aug 2009 04:41:49 +0000
Subject: [PATCH] --- yaml --- r: 159437 b: refs/heads/master c:
 a48ec346fcb095f6a0e74a57165f9a9a3b23b95a h: refs/heads/master i:   159435:
 76c42a5c1a45c450074731248c45c791deaaf023 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/tc35815.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a3c96322ccef..d46774146721 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bb82e834cc9cc95512287a9bf637719557674a0
+refs/heads/master: a48ec346fcb095f6a0e74a57165f9a9a3b23b95a
diff --git a/trunk/drivers/net/tc35815.c b/trunk/drivers/net/tc35815.c
index 411cc0e5f7a4..d1298e5b72c5 100644
--- a/trunk/drivers/net/tc35815.c
+++ b/trunk/drivers/net/tc35815.c
@@ -2394,8 +2394,6 @@ static void tc35815_chip_init(struct net_device *dev)
 		tc_writel(DMA_BURST_SIZE, &tr->DMA_Ctl);
 #ifdef TC35815_USE_PACKEDBUFFER
 	tc_writel(RxFrag_EnPack | ETH_ZLEN, &tr->RxFragSize);	/* Packing */
-#else
-	tc_writel(ETH_ZLEN, &tr->RxFragSize);
 #endif
 	tc_writel(0, &tr->TxPollCtr);	/* Batch mode */
 	tc_writel(TX_THRESHOLD, &tr->TxThrsh);