diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-04 08:30:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-04 08:30:12 -0800 |
| commit | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (patch) | |
| tree | c60c18f4fd4c0853feee6bb84b9fdadcb33e59e5 /drivers/net/niu.c | |
| parent | 4edfd20fafae41d77f210417b43d1416a733f48c (diff) | |
| parent | bbb770e7ab9a436752babfc8765e422d7481be1f (diff) | |
| download | kernel_samsung_aries-75fa67706cce5272bcfc51ed646f2da21f3bdb6e.zip kernel_samsung_aries-75fa67706cce5272bcfc51ed646f2da21f3bdb6e.tar.gz kernel_samsung_aries-75fa67706cce5272bcfc51ed646f2da21f3bdb6e.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
xfrm: Fix xfrm_policy_gc_lock handling.
niu: Use pci_ioremap_bar().
bnx2x: Version Update
bnx2x: Calling netif_carrier_off at the end of the probe
bnx2x: PCI configuration bug on big-endian
bnx2x: Removing the PMF indication when unloading
mv643xx_eth: fix SMI bus access timeouts
net: kconfig cleanup
fs_enet: fix polling
XFRM: copy_to_user_kmaddress() reports local address twice
SMC91x: Fix compilation on some platforms.
udp: Fix the SNMP counter of UDP_MIB_INERRORS
udp: Fix the SNMP counter of UDP_MIB_INDATAGRAMS
drivers/net/smc911x.c: Fix lockdep warning on xmit.
Diffstat (limited to 'drivers/net/niu.c')
| -rw-r--r-- | drivers/net/niu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index ebc8127..9acb5d7 100644 --- a/drivers/net/niu.c +++ b/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"); |