Merge branch 'x86/core' into x86/generalize-visws

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / printf.c

diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c
index 7e7e890699be9acf34756c7179e1b928db3c0bb8..50e47cdbdddd4234f78ab88028407c0aeccd8497 100644 (file)
--- a/arch/x86/boot/printf.c
+++ b/arch/x86/boot/printf.c
@@ -9,8 +9,6 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * arch/i386/boot/printf.c
- *
  * Oh, it's a waste of space, but oh-so-yummy for debugging.  This
  * version of printf() does not include 64-bit support.  "Live with
  * it."
@@ -58,7 +56,7 @@ static char *number(char *str, long num, int base, int size, int precision,
        if (type & LEFT)
                type &= ~ZEROPAD;
        if (base < 2 || base > 36)
-               return 0;
+               return NULL;
        c = (type & ZEROPAD) ? '0' : ' ';
        sign = 0;
        if (type & SIGN) {