Merge branch 'master' into tk71

[mv-sheeva.git] / arch / sparc / prom / misc_32.c

diff --git a/arch/sparc/prom/misc_32.c b/arch/sparc/prom/misc_32.c
index 4d61c540bb3d4780cbae52824fe099f30ae76d9c..8c278c311ba4788479f99448e310018de618ac7b 100644 (file)
--- a/arch/sparc/prom/misc_32.c
+++ b/arch/sparc/prom/misc_32.c
@@ -70,7 +70,7 @@ prom_cmdline(void)
 /* Drop into the prom, but completely terminate the program.
  * No chance of continuing.
  */
-void
+void __noreturn
 prom_halt(void)
 {
        unsigned long flags;