x86, setup: reorganize the early console setup

[net-next-2.6.git] / arch / x86 / boot / printf.c

diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c
index 50e47cdbdddd4234f78ab88028407c0aeccd8497..cdac91ca55d384e0e9cca2ff4e43ded437a44557 100644 (file)
--- a/arch/x86/boot/printf.c
+++ b/arch/x86/boot/printf.c
@@ -34,7 +34,7 @@ static int skip_atoi(const char **s)
 #define SMALL  32              /* Must be 32 == 0x20 */
 #define SPECIAL        64              /* 0x */
 
-#define do_div(n,base) ({ \
+#define __do_div(n, base) ({ \
 int __res; \
 __res = ((unsigned long) n) % (unsigned) base; \
 n = ((unsigned long) n) / (unsigned) base; \
@@ -83,7 +83,7 @@ static char *number(char *str, long num, int base, int size, int precision,
                tmp[i++] = '0';
        else
                while (num != 0)
-                       tmp[i++] = (digits[do_div(num, base)] | locase);
+                       tmp[i++] = (digits[__do_div(num, base)] | locase);
        if (i > precision)
                precision = i;
        size -= precision;