diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch) | |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /include/asm-arm/cpu-multi32.h | |
| parent | 8531c5ffbca65f6df868637c26e6df6f88bff738 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
Diffstat (limited to 'include/asm-arm/cpu-multi32.h')
| -rw-r--r-- | include/asm-arm/cpu-multi32.h | 2 |
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 { | |||
| 31 | /* | 31 | /* |
| 32 | * Special stuff for a reset | 32 | * Special stuff for a reset |
| 33 | */ | 33 | */ |
| 34 | volatile void (*reset)(unsigned long addr); | 34 | void (*reset)(unsigned long addr) __attribute__((noreturn)); |
| 35 | /* | 35 | /* |
| 36 | * Idle the processor | 36 | * Idle the processor |
| 37 | */ | 37 | */ |