Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / linux / pcieport_if.h

diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h
index cd3eafc2c23335976b915782c2e516cf8d1fa4e5..b44e01a70914a81cccabfdbc4ad4c4df1e3a5afc 100644 (file)
--- a/include/linux/pcieport_if.h
+++ b/include/linux/pcieport_if.h
@@ -59,7 +59,7 @@ struct pcie_port_service_driver {
        int (*probe) (struct pcie_device *dev, 
                const struct pcie_port_service_id *id);
        void (*remove) (struct pcie_device *dev);
-       int (*suspend) (struct pcie_device *dev, u32 state);
+       int (*suspend) (struct pcie_device *dev, pm_message_t state);
        int (*resume) (struct pcie_device *dev);
 
        const struct pcie_port_service_id *id_table;