Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / sparc / prom / bootstr_32.c

diff --git a/arch/sparc/prom/bootstr_32.c b/arch/sparc/prom/bootstr_32.c
index 916831da7e67327c818da9a0ec864aabb5411a4c..f5ec32e0d419b550313c71c344816808da7a4ab5 100644 (file)
--- a/arch/sparc/prom/bootstr_32.c
+++ b/arch/sparc/prom/bootstr_32.c
@@ -29,7 +29,8 @@ prom_getbootargs(void)
                /* Start from 1 and go over fd(0,0,0)kernel */
                for(iter = 1; iter < 8; iter++) {
                        arg = (*(romvec->pv_v0bootargs))->argv[iter];
-                       if(arg == 0) break;
+                       if (arg == NULL)
+                               break;
                        while(*arg != 0) {
                                /* Leave place for space and null. */
                                if(cp >= barg_buf + BARG_LEN-2){