Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

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,