diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /arch/x86/boot/printf.c | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'arch/x86/boot/printf.c')
| -rw-r--r-- | arch/x86/boot/printf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c index c1d00c0274c4..50e47cdbdddd 100644 --- 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, | |||
| 56 | if (type & LEFT) | 56 | if (type & LEFT) |
| 57 | type &= ~ZEROPAD; | 57 | type &= ~ZEROPAD; |
| 58 | if (base < 2 || base > 36) | 58 | if (base < 2 || base > 36) |
| 59 | return 0; | 59 | return NULL; |
| 60 | c = (type & ZEROPAD) ? '0' : ' '; | 60 | c = (type & ZEROPAD) ? '0' : ' '; |
| 61 | sign = 0; | 61 | sign = 0; |
| 62 | if (type & SIGN) { | 62 | if (type & SIGN) { |