diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 11:08:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 11:08:40 -0500 |
| commit | 3568834e813e0dd7547035b3148b2f2a2b48ee4e (patch) | |
| tree | 19dfbffbaba9c1b021f4ef2df783c3a3513a0891 /include | |
| parent | 8234b65afa92215ae0ed965811ac20c8b3a1806a (diff) | |
| parent | 8ee291f87c5dcebcf9c3a0ee4e021586897db364 (diff) | |
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.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index 664a2fa7adc9..80b027081b3c 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h | |||
| @@ -3,6 +3,10 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm/msr-index.h> | 4 | #include <asm/msr-index.h> |
| 5 | 5 | ||
| 6 | #ifndef __ASSEMBLY__ | ||
| 7 | # include <linux/types.h> | ||
| 8 | #endif | ||
| 9 | |||
| 6 | #ifdef __i386__ | 10 | #ifdef __i386__ |
| 7 | 11 | ||
| 8 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |