diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/message/fusion/mptspi.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
| -rw-r--r-- | drivers/message/fusion/mptspi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 5f9a61b85b3b..e0c0ee5bc966 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c | |||
| @@ -419,9 +419,7 @@ static struct pci_driver mptspi_driver = { | |||
| 419 | .id_table = mptspi_pci_table, | 419 | .id_table = mptspi_pci_table, |
| 420 | .probe = mptspi_probe, | 420 | .probe = mptspi_probe, |
| 421 | .remove = __devexit_p(mptscsih_remove), | 421 | .remove = __devexit_p(mptscsih_remove), |
| 422 | .driver = { | 422 | .shutdown = mptscsih_shutdown, |
| 423 | .shutdown = mptscsih_shutdown, | ||
| 424 | }, | ||
| 425 | #ifdef CONFIG_PM | 423 | #ifdef CONFIG_PM |
| 426 | .suspend = mptscsih_suspend, | 424 | .suspend = mptscsih_suspend, |
| 427 | .resume = mptscsih_resume, | 425 | .resume = mptscsih_resume, |