From bb4b6dd00dcb5c241390174557851f31937b4059 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 3 Nov 2008 17:05:16 -0800
Subject: [PATCH] --- yaml --- r: 118415 b: refs/heads/master c:
 19ecb6ba800765743bb4525c66562f0d30993f8d h: refs/heads/master i:   118413:
 01cf09fab9f0ad4ac15ff21cfb4d611cc42c7fb9   118411:
 55f553306dec8ce19f1e68dbed0e85fe7b85cba7   118407:
 d2248c6e73aba9a8b0bd3034bcec76b9de82076c   118399:
 ca602c6324137aeaafeca047825fc765a6cc856a v: v3

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

diff --git a/[refs] b/[refs]
index 374bd066f645..632fe8a69b43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca8eac55fa554043c57fd18d595ca356e752833e
+refs/heads/master: 19ecb6ba800765743bb4525c66562f0d30993f8d
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index ebc812702903..9acb5d70a3ae 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/drivers/net/niu.c
@@ -8667,7 +8667,6 @@ static void __devinit niu_device_announce(struct niu *np)
 static int __devinit niu_pci_init_one(struct pci_dev *pdev,
 				      const struct pci_device_id *ent)
 {
-	unsigned long niureg_base, niureg_len;
 	union niu_parent_id parent_id;
 	struct net_device *dev;
 	struct niu *np;
@@ -8758,10 +8757,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
 
 	dev->features |= (NETIF_F_SG | NETIF_F_HW_CSUM);
 
-	niureg_base = pci_resource_start(pdev, 0);
-	niureg_len = pci_resource_len(pdev, 0);
-
-	np->regs = ioremap_nocache(niureg_base, niureg_len);
+	np->regs = pci_ioremap_bar(pdev, 0);
 	if (!np->regs) {
 		dev_err(&pdev->dev, PFX "Cannot map device registers, "
 			"aborting.\n");