aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/rtas.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-11-07 16:41:59 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-08 11:19:36 +1100
commit21fe3301f11a93c4f18e8480ed08522559bf0a50 (patch)
tree76076ecea25a621f0cffc856025279022ee8d234 /arch/powerpc/kernel/rtas.c
parent75722d3992f57375c0cc029dcceb2334a45ceff1 (diff)
downloadkernel_samsung_smdk4412-21fe3301f11a93c4f18e8480ed08522559bf0a50.zip
kernel_samsung_smdk4412-21fe3301f11a93c4f18e8480ed08522559bf0a50.tar.gz
kernel_samsung_smdk4412-21fe3301f11a93c4f18e8480ed08522559bf0a50.tar.bz2
[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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 751f5dd..9d4e07f 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -17,6 +17,7 @@
#include <linux/spinlock.h>
#include <linux/module.h>
#include <linux/init.h>
+#include <linux/delay.h>
#include <asm/prom.h>
#include <asm/rtas.h>
@@ -83,7 +84,7 @@ void call_rtas_display_status_delay(unsigned char c)
while (width-- > 0)
call_rtas_display_status(' ');
width = 16;
- udelay(500000);
+ mdelay(500);
pending_newline = 1;
} else {
if (pending_newline) {