From 418c23e0a3b3fac719eb41e61a0723f6e5ed0eda Mon Sep 17 00:00:00 2001 From: walimis Date: Mon, 3 Dec 2012 02:19:44 +0000 Subject: [PATCH] --- yaml --- r: 341737 b: refs/heads/master c: 3e14bd390ebe41e8b83855fd85fb64478c7c5ee2 h: refs/heads/master i: 341735: c25f88e64a016d07d12d3fe2bdb56ca11e947fd5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a973e16c837f..dc23e1507d66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f210e87b6d3aab1fb3eb51a006f4502c1a7a2494 +refs/heads/master: 3e14bd390ebe41e8b83855fd85fb64478c7c5ee2 diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h index 807f30371e49..ab4896ecac1c 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h @@ -80,8 +80,6 @@ #define DMA_STATUS_GPI 0x10000000 /* PMT interrupt */ #define DMA_STATUS_GMI 0x08000000 /* MMC interrupt */ #define DMA_STATUS_GLI 0x04000000 /* GMAC Line interface int */ -#define DMA_STATUS_GMI 0x08000000 -#define DMA_STATUS_GLI 0x04000000 #define DMA_STATUS_EB_MASK 0x00380000 /* Error Bits Mask */ #define DMA_STATUS_EB_TX_ABORT 0x00080000 /* Error Bits - TX Abort */ #define DMA_STATUS_EB_RX_ABORT 0x00100000 /* Error Bits - RX Abort */