Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-ppc / ocp.h

diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h
index 3d735b9..983116f 100644 (file)
--- a/include/asm-ppc/ocp.h
+++ b/include/asm-ppc/ocp.h
@@ -119,7 +119,7 @@ struct ocp_driver {
        const struct ocp_device_id *id_table;   /* NULL if wants all devices */
        int  (*probe)  (struct ocp_device *dev);        /* New device inserted */
        void (*remove) (struct ocp_device *dev);        /* Device removed (NULL if not a hot-plug capable driver) */
-       int  (*suspend) (struct ocp_device *dev, u32 state);    /* Device suspended */
+       int  (*suspend) (struct ocp_device *dev, pm_message_t state);   /* Device suspended */
        int  (*resume) (struct ocp_device *dev);                        /* Device woken up */
        struct device_driver driver;
 };
@@ -189,7 +189,7 @@ extern void ocp_for_each_device(void(*callback)(struct ocp_device *, void *arg),
 /* Sysfs support */
 #define OCP_SYSFS_ADDTL(type, format, name, field)                     \
 static ssize_t                                                         \
-show_##name##_##field(struct device *dev, char *buf)                   \
+show_##name##_##field(struct device *dev, struct device_attribute *attr, char *buf)                    \
 {                                                                      \
        struct ocp_device *odev = to_ocp_dev(dev);                      \
        type *add = odev->def->additions;                               \