Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / arch / ppc / syslib / ppc_sys.c

diff --git a/arch/ppc/syslib/ppc_sys.c b/arch/ppc/syslib/ppc_sys.c
index 52ba0c68078df3c09052d4fcac72550af29b86cb..603f0119081602e866d83324acf09f7c7a93808d 100644 (file)
--- a/arch/ppc/syslib/ppc_sys.c
+++ b/arch/ppc/syslib/ppc_sys.c
@@ -14,6 +14,7 @@
  * option) any later version.
  */
 
+#include <linux/string.h>
 #include <asm/ppc_sys.h>
 
 int (*ppc_sys_device_fixup) (struct platform_device * pdev);
@@ -69,6 +70,9 @@ static int __init find_chip_by_name_and_id(char *name, u32 id)
                        matched[j++] = i;
                i++;
        }
+
+       ret = i;
+
        if (j != 0) {
                for (i = 0; i < j; i++) {
                        if ((ppc_sys_specs[matched[i]].mask & id) ==