Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / ops.h

diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index 4b0544b03c640fb45d8f4aef229c7a019dc7a6ee..b3218ce451bb9be8081dd77cc75f0a3114468be1 100644 (file)
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -40,6 +40,7 @@ struct dt_ops {
                        const int buflen);
        int     (*setprop)(const void *phandle, const char *name,
                        const void *buf, const int buflen);
+       int (*del_node)(const void *phandle);
        void *(*get_parent)(const void *phandle);
        /* The node must not already exist. */
        void *(*create_node)(const void *parent, const char *name);
@@ -95,6 +96,7 @@ int dt_xlate_reg(void *node, int res, unsigned long *addr, unsigned long *size);
 int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
 int dt_is_compatible(void *node, const char *compat);
 void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize);
+int dt_get_virtual_reg(void *node, void **addr, int nres);
 
 static inline void *finddevice(const char *name)
 {
@@ -125,6 +127,11 @@ static inline int setprop_str(void *devp, const char *name, const char *buf)
        return -1;
 }
 
+static inline int del_node(const void *devp)
+{
+       return dt_ops.del_node ? dt_ops.del_node(devp) : -1;
+}
+
 static inline void *get_parent(const char *devp)
 {
        return dt_ops.get_parent ? dt_ops.get_parent(devp) : NULL;