Automerge with /usr/src/ntfs-2.6.git.

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 = {
         .id_table       = mptspi_pci_table,
         .probe          = mptspi_probe,
         .remove         = __devexit_p(mptscsih_remove),
-        .driver         = {
-                .shutdown = mptscsih_shutdown,
-        },
+        .shutdown       = mptscsih_shutdown,
 #ifdef CONFIG_PM
         .suspend        = mptscsih_suspend,
         .resume         = mptscsih_resume,