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/mptfc.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/message/fusion/mptfc.c')
| -rw-r--r-- | drivers/message/fusion/mptfc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index d8d65397e06e..353deb25e397 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c | |||
| @@ -364,9 +364,7 @@ static struct pci_driver mptfc_driver = { | |||
| 364 | .id_table = mptfc_pci_table, | 364 | .id_table = mptfc_pci_table, |
| 365 | .probe = mptfc_probe, | 365 | .probe = mptfc_probe, |
| 366 | .remove = __devexit_p(mptscsih_remove), | 366 | .remove = __devexit_p(mptscsih_remove), |
| 367 | .driver = { | 367 | .shutdown = mptscsih_shutdown, |
| 368 | .shutdown = mptscsih_shutdown, | ||
| 369 | }, | ||
| 370 | #ifdef CONFIG_PM | 368 | #ifdef CONFIG_PM |
| 371 | .suspend = mptscsih_suspend, | 369 | .suspend = mptscsih_suspend, |
| 372 | .resume = mptscsih_resume, | 370 | .resume = mptscsih_resume, |