Merge commit 'v2.6.26-rc9' into sched/devel

[pandora-kernel.git] / include / asm-powerpc / parport.h

diff --git a/include/asm-powerpc/parport.h b/include/asm-powerpc/parport.h
index d86b410..414c50e 100644 (file)
--- a/include/asm-powerpc/parport.h
+++ b/include/asm-powerpc/parport.h
@@ -8,11 +8,32 @@
 
 #ifndef _ASM_POWERPC_PARPORT_H
 #define _ASM_POWERPC_PARPORT_H
+#ifdef __KERNEL__
+
+#include <asm/prom.h>
 
-static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma);
 static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
 {
-       return parport_pc_find_isa_ports (autoirq, autodma);
+       struct device_node *np;
+       const u32 *prop;
+       u32 io1, io2;
+       int propsize;
+       int count = 0;
+       for (np = NULL; (np = of_find_compatible_node(np,
+                                                     "parallel",
+                                                     "pnpPNP,400")) != NULL;) {
+               prop = of_get_property(np, "reg", &propsize);
+               if (!prop || propsize > 6*sizeof(u32))
+                       continue;
+               io1 = prop[1]; io2 = prop[2];
+               prop = of_get_property(np, "interrupts", NULL);
+               if (!prop)
+                       continue;
+               if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL) != NULL)
+                       count++;
+       }
+       return count;
 }
 
+#endif /* __KERNEL__ */
 #endif /* !(_ASM_POWERPC_PARPORT_H) */