vserver 2.0 rc7

[linux-2.6.git] / drivers / pci / pcie / portdrv_pci.c

diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index daccaf5..e9095ee 100644 (file)
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -67,7 +67,7 @@ static void pcie_portdrv_remove (struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PM
-static int pcie_portdrv_suspend (struct pci_dev *dev, u32 state)
+static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state)
 {
        return pcie_port_device_suspend(dev, state);
 }
@@ -106,7 +106,7 @@ static int __init pcie_portdrv_init(void)
        int retval = 0;
 
        pcie_port_bus_register();
-       retval = pci_module_init(&pcie_portdrv);
+       retval = pci_register_driver(&pcie_portdrv);
        if (retval)
                pcie_port_bus_unregister();
        return retval;