This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / xmon / start.c

diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index d880967..802775f 100644 (file)
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -448,13 +448,13 @@ xmon_init_scc(void)
        scc_initialized = 1;
        if (via_modem) {
                for (;;) {
-                       xmon_write(NULL, "ATE1V1\r", 7);
+                       xmon_write(0, "ATE1V1\r", 7);
                        if (xmon_expect("OK", 5)) {
-                               xmon_write(NULL, "ATA\r", 4);
+                               xmon_write(0, "ATA\r", 4);
                                if (xmon_expect("CONNECT", 40))
                                        break;
                        }
-                       xmon_write(NULL, "+++", 3);
+                       xmon_write(0, "+++", 3);
                        xmon_expect("OK", 3);
                }
        }
@@ -618,7 +618,7 @@ xmon_fgets(char *str, int nb, void *f)
        c = xmon_getchar();
        if (c == -1) {
            if (p == str)
-               return NULL;
+               return 0;
            break;
        }
        *p++ = c;