Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[pandora-kernel.git] / arch / sparc / include / asm / openprom.h

diff --git a/arch/sparc/include/asm/openprom.h b/arch/sparc/include/asm/openprom.h
index 963e1a4..81cd434 100644 (file)
--- a/arch/sparc/include/asm/openprom.h
+++ b/arch/sparc/include/asm/openprom.h
@@ -11,6 +11,8 @@
 #define LINUX_OPPROM_MAGIC      0x10010407
 
 #ifndef __ASSEMBLY__
+#include <linux/of.h>
+
 /* V0 prom device operations. */
 struct linux_dev_v0_funcs {
        int (*v0_devopen)(char *device_str);
@@ -26,7 +28,7 @@ struct linux_dev_v0_funcs {
 
 /* V2 and later prom device operations. */
 struct linux_dev_v2_funcs {
-       int (*v2_inst2pkg)(int d);      /* Convert ihandle to phandle */
+       phandle (*v2_inst2pkg)(int d);  /* Convert ihandle to phandle */
        char * (*v2_dumb_mem_alloc)(char *va, unsigned sz);
        void (*v2_dumb_mem_free)(char *va, unsigned sz);
 
@@ -168,12 +170,12 @@ struct linux_romvec {
 
 /* Routines for traversing the prom device tree. */
 struct linux_nodeops {
-       int (*no_nextnode)(int node);
-       int (*no_child)(int node);
-       int (*no_proplen)(int node, const char *name);
-       int (*no_getprop)(int node, const char *name, char *val);
-       int (*no_setprop)(int node, const char *name, char *val, int len);
-       char * (*no_nextprop)(int node, char *name);
+       phandle (*no_nextnode)(phandle node);
+       phandle (*no_child)(phandle node);
+       int (*no_proplen)(phandle node, const char *name);
+       int (*no_getprop)(phandle node, const char *name, char *val);
+       int (*no_setprop)(phandle node, const char *name, char *val, int len);
+       char * (*no_nextprop)(phandle node, char *name);
 };
 
 /* More fun PROM structures for device probing. */