From dc4d62a6d2f2fbe19f1c7ff20ddac90ab8253ae7 Mon Sep 17 00:00:00 2001
From: Marin Mitov <mitov@issp.bas.bg>
Date: Sun, 8 Nov 2009 05:59:27 +0000
Subject: [PATCH] --- yaml --- r: 171483 b: refs/heads/master c:
 8cbd9623da7e7a99c6bd0f0b7d21d17c233c6abb h: refs/heads/master i:   171481:
 22e940aefcf68619b70aa3037ef923de7b8d47f1   171479:
 0031bc35d44874ee99a8a4e2e592a83f33a18468 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/niu.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a88ecadff5b0..b68302d73bc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30fff9231fad757c061285e347b33c5149c2c2e4
+refs/heads/master: 8cbd9623da7e7a99c6bd0f0b7d21d17c233c6abb
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index 5506f870037f..44558fcb56ac 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/drivers/net/niu.c
@@ -45,10 +45,6 @@ MODULE_DESCRIPTION("NIU ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_MODULE_VERSION);
 
-#ifndef DMA_44BIT_MASK
-#define DMA_44BIT_MASK	0x00000fffffffffffULL
-#endif
-
 #ifndef readq
 static u64 readq(void __iomem *reg)
 {
@@ -9918,7 +9914,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
 		  PCI_EXP_DEVCTL_RELAX_EN);
 	pci_write_config_word(pdev, pos + PCI_EXP_DEVCTL, val16);
 
-	dma_mask = DMA_44BIT_MASK;
+	dma_mask = DMA_BIT_MASK(44);
 	err = pci_set_dma_mask(pdev, dma_mask);
 	if (!err) {
 		dev->features |= NETIF_F_HIGHDMA;