git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
arch
/
sparc
/
prom
/
misc_32.c
diff --git
a/arch/sparc/prom/misc_32.c
b/arch/sparc/prom/misc_32.c
index
4d61c54
..
8c278c3
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;