projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-2.6-block.git]
/
drivers
/
net
/
wireless
/
rt2x00
/
rt2x00pci.c
diff --git
a/drivers/net/wireless/rt2x00/rt2x00pci.c
b/drivers/net/wireless/rt2x00/rt2x00pci.c
index dc49e525ae5e55e9a090308b80122998e08857d8..25da20e7e1f34ab2c0b1fd3e38a82d1faece0f9e 100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/
drivers/net/wireless/rt2x00/rt2x00pci.c
@@
-119,7
+119,7
@@
int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
rt2x00dev->ops = ops;
rt2x00dev->hw = hw;
rt2x00dev->irq = pci_dev->irq;
- rt2x00dev->name =
pci_name(pci_dev)
;
+ rt2x00dev->name =
ops->name
;
if (pci_is_pcie(pci_dev))
rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);