Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-i386 / therm_throt.h

diff --git a/include/asm-i386/therm_throt.h b/include/asm-i386/therm_throt.h
index 3c9c22cc10c97c7bf8c2d5f49ca209b1751417ff..399bf6026b16c8fd8f17a9fcf154653321495c7a 100644 (file)
--- a/include/asm-i386/therm_throt.h
+++ b/include/asm-i386/therm_throt.h
@@ -1,6 +1,9 @@
 #ifndef __ASM_I386_THERM_THROT_H__
 #define __ASM_I386_THERM_THROT_H__ 1
 
+#include <asm/atomic.h>
+
+extern atomic_t therm_throt_en;
 int therm_throt_process(int curr);
 
 #endif /* __ASM_I386_THERM_THROT_H__ */