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

[linux-2.6] / include / asm-ppc / of_device.h

diff --git a/include/asm-ppc/of_device.h b/include/asm-ppc/of_device.h
index 14441c629010c75eb0ec5aff89e0dd738b8af7b1..4b264cfd39987cb368843ae346199c6cf2822e97 100644 (file)
--- a/include/asm-ppc/of_device.h
+++ b/include/asm-ppc/of_device.h
@@ -24,20 +24,8 @@ struct of_device
 };
 #define        to_of_device(d) container_of(d, struct of_device, dev)
 
-/*
- * Struct used for matching a device
- */
-struct of_match
-{
-       char    *name;
-       char    *type;
-       char    *compatible;
-       void    *data;
-};
-#define OF_ANY_MATCH           ((char *)-1L)
-
-extern const struct of_match *of_match_device(
-       const struct of_match *matches, const struct of_device *dev);
+extern const struct of_device_id *of_match_device(
+       const struct of_device_id *matches, const struct of_device *dev);
 
 extern struct of_device *of_dev_get(struct of_device *dev);
 extern void of_dev_put(struct of_device *dev);
@@ -49,13 +37,13 @@ extern void of_dev_put(struct of_device *dev);
 struct of_platform_driver
 {
        char                    *name;
-       struct of_match         *match_table;
+       struct of_device_id     *match_table;
        struct module           *owner;
 
-       int     (*probe)(struct of_device* dev, const struct of_match *match);
+       int     (*probe)(struct of_device* dev, const struct of_device_id *match);
        int     (*remove)(struct of_device* dev);
 
-       int     (*suspend)(struct of_device* dev, u32 state);
+       int     (*suspend)(struct of_device* dev, pm_message_t state);
        int     (*resume)(struct of_device* dev);
        int     (*shutdown)(struct of_device* dev);