Merge commit 'v2.6.29' into timers/core

[cascardo/linux.git] / arch / x86 / boot / printf.c

diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c
index c1d00c0..50e47cd 100644 (file)
--- a/arch/x86/boot/printf.c
+++ b/arch/x86/boot/printf.c
@@ -56,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) {