summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/cpu-multi32.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-30 01:01:43 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-08-30 01:01:43 +0200
commitda61396d24e37258817e42537c482e962b4742f7 (patch)
tree4293a5d557b8f9fed8a2bac93f1e5c939c7b65c3 /include/asm-arm/cpu-multi32.h
parentMerge /spare/repo/linux-2.6/ (diff)
parentMerge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff)
downloadlinux-da61396d24e37258817e42537c482e962b4742f7.tar.xz
linux-da61396d24e37258817e42537c482e962b4742f7.zip
Merge upstream kernel into libata 'passthru' branch
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
*/