From 50829b429be1865fe4cdc11ae51530794585b911 Mon Sep 17 00:00:00 2001 From: Jay Cliburn Date: Thu, 19 Jul 2007 18:45:11 -0500 Subject: [PATCH] --- yaml --- r: 62815 b: refs/heads/master c: 3f516c00d416bd39aab6cfb348b68919e295fe23 h: refs/heads/master i: 62813: 88a094b263ab1e9f7ee0df1f13a4b1518892f777 62811: 89abbf16fef76be53435c50c28433b2be77bd2b5 62807: ba2855639c0f71940e3534acee99166f1899fd70 62799: 70c2d8f985c4721916422cf7b8ea9b7c16d585b6 62783: 38fa5aa9b926dfc06c8f5d0cd1076edcda40681d v: v3 --- [refs] | 2 +- trunk/drivers/net/atl1/atl1_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 58ef5bae15a2..2686885b3482 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6a7ff4a617ad3f6a59e2576d430b9292299d067 +refs/heads/master: 3f516c00d416bd39aab6cfb348b68919e295fe23 diff --git a/trunk/drivers/net/atl1/atl1_main.c b/trunk/drivers/net/atl1/atl1_main.c index 79d60e14775c..3b8f633ec05e 100644 --- a/trunk/drivers/net/atl1/atl1_main.c +++ b/trunk/drivers/net/atl1/atl1_main.c @@ -908,8 +908,8 @@ static u32 atl1_configure(struct atl1_adapter *adapter) /* config DMA Engine */ value = ((((u32) hw->dmar_block) & DMA_CTRL_DMAR_BURST_LEN_MASK) << DMA_CTRL_DMAR_BURST_LEN_SHIFT) | - ((((u32) hw->dmaw_block) & DMA_CTRL_DMAR_BURST_LEN_MASK) - << DMA_CTRL_DMAR_BURST_LEN_SHIFT) | DMA_CTRL_DMAR_EN | + ((((u32) hw->dmaw_block) & DMA_CTRL_DMAW_BURST_LEN_MASK) + << DMA_CTRL_DMAW_BURST_LEN_SHIFT) | DMA_CTRL_DMAR_EN | DMA_CTRL_DMAW_EN; value |= (u32) hw->dma_ord; if (atl1_rcb_128 == hw->rcb_value)