diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-03-16 19:27:08 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-16 19:27:08 -0500 |
| commit | abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b (patch) | |
| tree | b0c846052b994d57d58713a0cc8da30a22baaf1c /include/asm-arm/system.h | |
| parent | [PATCH] drivers/net/e1000/: proper prototypes (diff) | |
| parent | [netdrvr] fix array overflows in Chelsio driver (diff) | |
| download | linux-dev-abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b.tar.xz linux-dev-abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/asm-arm/system.h')
| -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 eb2de8c10515..ec91d1ff032a 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 return ret; } +extern void disable_hlt(void); +extern void enable_hlt(void); + #endif /* __ASSEMBLY__ */ #define arch_align_stack(x) (x) |