diff --git a/[refs] b/[refs] index 3c8245597f0b..1d9577963074 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4 +refs/heads/master: 7fafd91d85181e946207bed18c44addc47e36c63 diff --git a/trunk/arch/x86/boot/printf.c b/trunk/arch/x86/boot/printf.c index c1d00c0274c4..50e47cdbdddd 100644 --- a/trunk/arch/x86/boot/printf.c +++ b/trunk/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) {