summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-15 08:08:40 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-15 08:08:40 -0800
commit3568834e813e0dd7547035b3148b2f2a2b48ee4e (patch)
tree19dfbffbaba9c1b021f4ef2df783c3a3513a0891 /include
parent8234b65afa92215ae0ed965811ac20c8b3a1806a (diff)
parent8ee291f87c5dcebcf9c3a0ee4e021586897db364 (diff)
downloadop-kernel-dev-3568834e813e0dd7547035b3148b2f2a2b48ee4e.zip
op-kernel-dev-3568834e813e0dd7547035b3148b2f2a2b48ee4e.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC x86: asm-x86/msr.h: pull in linux/types.h x86: fix boot crash on HIGHMEM4G && SPARSEMEM
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/msr.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h
index 664a2fa..80b0270 100644
--- a/include/asm-x86/msr.h
+++ b/include/asm-x86/msr.h
@@ -3,6 +3,10 @@
#include <asm/msr-index.h>
+#ifndef __ASSEMBLY__
+# include <linux/types.h>
+#endif
+
#ifdef __i386__
#ifdef __KERNEL__
OpenPOWER on IntegriCloud