Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[linux-2.6] / drivers / message / fusion / mptfc.c

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 29f66de4e8f16ef7ac421b9216fcff7f598deb25..13771abea13f28f075bab7e338f787221bcbc9fd 100644 (file)
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -347,9 +347,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,