diff --git a/[refs] b/[refs] index e7fd2bd06e2e..067f68d7752c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eef8f871d84b5df1a24902a4e4700188be1aff2c +refs/heads/master: 535694f361419ca195fd915dd5038c926334e1be 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) {