From 7abb2a3261e9d1bda3c1a0860f9b8999bc197ea5 Mon Sep 17 00:00:00 2001 From: Giuseppe CAVALLARO Date: Thu, 1 Sep 2011 21:51:35 +0000 Subject: [PATCH] --- yaml --- r: 265743 b: refs/heads/master c: 2e19a3818bd6438213e312fce14af6217a5a749b h: refs/heads/master i: 265741: 9b3e77fbc002684e3e915d212299887807ee5219 265739: e70a471c3da4e3942fe151a35b7a84304cbd9ff9 265735: c793e005f974346a9371355de45511258466f596 265727: f6d5544e937d50d8f978e32282306eed3946c0ce v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 15acb53657b3..8f5835ed001c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcef1151804257684f65c779fc1c19836ee0196a +refs/heads/master: 2e19a3818bd6438213e312fce14af6217a5a749b diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c index 0f63b3c83c19..eea184ab6d64 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c @@ -37,9 +37,6 @@ static void dwmac1000_core_init(void __iomem *ioaddr) value |= GMAC_CORE_INIT; writel(value, ioaddr + GMAC_CONTROL); - /* STBus Bridge Configuration */ - /*writel(0xc5608, ioaddr + 0x00007000);*/ - /* Freeze MMC counters */ writel(0x8, ioaddr + GMAC_MMC_CTRL); /* Mask GMAC interrupts */