aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/system.h
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-03-20 10:53:56 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-03-20 10:53:56 -0600
commit61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch)
tree2cf21d235f17e80d47fdb4ee1248865be8196d4d /include/asm-arm/system.h
parent9585da3729e7e27bf22818625c10ac6c64ebb609 (diff)
parent2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff)
downloadkernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.gz
kernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.bz2
kernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.zip
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/system.h')
-rw-r--r--include/asm-arm/system.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index eb2de8c1051..ec91d1ff032 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)