diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 07:51:07 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 07:51:07 -0500 |
| commit | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (patch) | |
| tree | c2db1b4958bbf617a25398b7ef93d82006b26a17 /drivers/net/sungem.c | |
| parent | 292d4ed32e35df4755052b5002e533348d1648fd (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 081717d01374..28ce47a02408 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -2907,7 +2907,7 @@ static int __devinit gem_get_device_address(struct gem *gp) | |||
| 2907 | return 0; | 2907 | return 0; |
| 2908 | } | 2908 | } |
| 2909 | 2909 | ||
| 2910 | static void __devexit gem_remove_one(struct pci_dev *pdev) | 2910 | static void gem_remove_one(struct pci_dev *pdev) |
| 2911 | { | 2911 | { |
| 2912 | struct net_device *dev = pci_get_drvdata(pdev); | 2912 | struct net_device *dev = pci_get_drvdata(pdev); |
| 2913 | 2913 | ||
| @@ -3181,7 +3181,7 @@ static struct pci_driver gem_driver = { | |||
| 3181 | .name = GEM_MODULE_NAME, | 3181 | .name = GEM_MODULE_NAME, |
| 3182 | .id_table = gem_pci_tbl, | 3182 | .id_table = gem_pci_tbl, |
| 3183 | .probe = gem_init_one, | 3183 | .probe = gem_init_one, |
| 3184 | .remove = __devexit_p(gem_remove_one), | 3184 | .remove = gem_remove_one, |
| 3185 | #ifdef CONFIG_PM | 3185 | #ifdef CONFIG_PM |
| 3186 | .suspend = gem_suspend, | 3186 | .suspend = gem_suspend, |
| 3187 | .resume = gem_resume, | 3187 | .resume = gem_resume, |