summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00pci.c
diff options
context:
space:
mode:
authorPaul Mundt2010-05-31 06:14:26 +0200
committerPaul Mundt2010-05-31 06:14:26 +0200
commitd5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch)
tree4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/net/wireless/rt2x00/rt2x00pci.c
parentARM: mach-shmobile: SH7372 has 6 SCIFA and 1 SCIFB ports (diff)
parentLinux 2.6.35-rc1 (diff)
downloadkernel-qcow2-linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.gz
kernel-qcow2-linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.xz
kernel-qcow2-linux-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index a016f7ccde29..f71eee67f977 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -206,7 +206,7 @@ void rt2x00pci_uninitialize(struct rt2x00_dev *rt2x00dev)
/*
* Free irq line.
*/
- free_irq(to_pci_dev(rt2x00dev->dev)->irq, rt2x00dev);
+ free_irq(rt2x00dev->irq, rt2x00dev);
/*
* Free DMA