From 823fd8bf5866ca840188dcabf7c1e74f3f70adce Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 12 May 2008 15:43:35 +0200
Subject: [PATCH] --- yaml --- r: 99357 b: refs/heads/master c:
 535694f361419ca195fd915dd5038c926334e1be h: refs/heads/master i:   99355:
 2f7859794c1b7ced817e550fc17830ead99d7538 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/boot/printf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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) {