diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 15:21:41 -0700 | 
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 15:21:41 -0700 | 
| 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 = {  	.id_table	= mptfc_pci_table,  	.probe		= mptfc_probe,  	.remove		= __devexit_p(mptscsih_remove), -	.driver         = { -		.shutdown = mptscsih_shutdown, -        }, +	.shutdown	= mptscsih_shutdown,  #ifdef CONFIG_PM  	.suspend	= mptscsih_suspend,  	.resume		= mptscsih_resume,  | 
