diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-07 00:41:59 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:19:36 -0500 |
commit | 21fe3301f11a93c4f18e8480ed08522559bf0a50 (patch) | |
tree | 76076ecea25a621f0cffc856025279022ee8d234 /arch/powerpc/kernel/rtas.c | |
parent | 75722d3992f57375c0cc029dcceb2334a45ceff1 (diff) |
[PATCH] ppc: fix a bunch of warnings
Building a PowerMac kernel with ARCH=powerpc causes a bunch of warnings,
this fixes some of them
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/rtas.c')
-rw-r--r-- | arch/powerpc/kernel/rtas.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 751f5ddea913..9d4e07f6f1ec 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/delay.h> | ||
20 | 21 | ||
21 | #include <asm/prom.h> | 22 | #include <asm/prom.h> |
22 | #include <asm/rtas.h> | 23 | #include <asm/rtas.h> |
@@ -83,7 +84,7 @@ void call_rtas_display_status_delay(unsigned char c) | |||
83 | while (width-- > 0) | 84 | while (width-- > 0) |
84 | call_rtas_display_status(' '); | 85 | call_rtas_display_status(' '); |
85 | width = 16; | 86 | width = 16; |
86 | udelay(500000); | 87 | mdelay(500); |
87 | pending_newline = 1; | 88 | pending_newline = 1; |
88 | } else { | 89 | } else { |
89 | if (pending_newline) { | 90 | if (pending_newline) { |