diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-15 21:17:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-15 21:17:11 -0500 |
| commit | 5466eb5d0ad5e9d4238da71a2a9bd216985a4849 (patch) | |
| tree | ade97b6e34e53ad5611fb1d1ac51a850a81bcec7 /include | |
| parent | 2d7f2ea9c989853310c7f6e8be52cc090cc8e66b (diff) | |
| parent | 4333298965cd62585bec891a6a5c9f4c806fc6bd (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3362/1: [cleanup] - duplicate decleration of mem_fclk_21285
[ARM] 3365/1: [cleanup] header for compat.c exported functions
[ARM] 3364/1: [cleanup] warning fix - definitions for enable_hlt and disable_hlt
[ARM] 3363/1: [cleanup] process.c - fix warnings
[ARM] 3358/1: [S3C2410] add missing SPI DMA resources
[ARM] 3357/1: enable frontlight on collie
[ARM] Fix "thead" typo
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/system.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index eb2de8c105..ec91d1ff03 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h | |||
| @@ -415,6 +415,9 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size | |||
| 415 | return ret; | 415 | return ret; |
| 416 | } | 416 | } |
| 417 | 417 | ||
| 418 | extern void disable_hlt(void); | ||
| 419 | extern void enable_hlt(void); | ||
| 420 | |||
| 418 | #endif /* __ASSEMBLY__ */ | 421 | #endif /* __ASSEMBLY__ */ |
| 419 | 422 | ||
| 420 | #define arch_align_stack(x) (x) | 423 | #define arch_align_stack(x) (x) |