summaryrefslogtreecommitdiff
path: root/include/asm-arm/cpu-multi32.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-29 19:10:39 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-29 19:10:39 -0400
commit739cdbf1d8f0739b80035b80d69d871e33749b86 (patch)
tree15134df8723ab7d7a5524c99070f02d5739bad0d /include/asm-arm/cpu-multi32.h
parent83bbecc905b3431c60fe282830e09aaaab97b26a (diff)
parent8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff)
downloadlinux-next-739cdbf1d8f0739b80035b80d69d871e33749b86.tar.gz
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-arm/cpu-multi32.h')
-rw-r--r--include/asm-arm/cpu-multi32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/cpu-multi32.h b/include/asm-arm/cpu-multi32.h
index ff48022e4720..4679f63688e9 100644
--- a/include/asm-arm/cpu-multi32.h
+++ b/include/asm-arm/cpu-multi32.h
@@ -31,7 +31,7 @@ extern struct processor {
/*
* Special stuff for a reset
*/
- volatile void (*reset)(unsigned long addr);
+ void (*reset)(unsigned long addr) __attribute__((noreturn));
/*
* Idle the processor
*/