diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:26:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:26:39 -0800 |
commit | 388f7ef720a982f49925e7b4e96f216f208f8c03 (patch) | |
tree | 75bfe3290db6d99232f56eadaf41a51197c5ba7c /drivers/net/wireless/atmel_pci.c | |
parent | d5eebf428ac91ad12d316a391b734670d61480d8 (diff) | |
parent | 560c22fe1fc8b3523ef422da4f1cf04aa22d1471 (diff) | |
download | linux-388f7ef720a982f49925e7b4e96f216f208f8c03.tar.gz linux-388f7ef720a982f49925e7b4e96f216f208f8c03.tar.xz |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/atmel_pci.c')
-rw-r--r-- | drivers/net/wireless/atmel_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c index 2eb00a957bbe..a61b3bc6cccf 100644 --- a/drivers/net/wireless/atmel_pci.c +++ b/drivers/net/wireless/atmel_pci.c @@ -72,7 +72,7 @@ static int __devinit atmel_pci_probe(struct pci_dev *pdev, static void __devexit atmel_pci_remove(struct pci_dev *pdev) { - stop_atmel_card(pci_get_drvdata(pdev), 1); + stop_atmel_card(pci_get_drvdata(pdev)); } static int __init atmel_init_module(void) |