diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-26 18:02:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-26 18:02:12 -0400 |
| commit | 08dcf29e01dcb786c13dc80045bd65f804117efb (patch) | |
| tree | d5820c2fdfd136681a836060f63cbdae9b8997de /arch/x86/kernel/mfgpt_32.c | |
| parent | 11320d17ce4ecf8002dc8f9b6f1e49cd18e45a94 (diff) | |
| parent | d546b67a940eb42a99f56b86c5cd8d47c8348c2a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix performance drop for glx
x86: fix trim mtrr not to setup_memory two times
x86: GEODE: add missing module.h include
x86, cpufreq: fix Speedfreq-SMI call that clobbers ECX
x86: fix memoryless node oops during boot
x86: add dmi quirk for io_delay
x86: convert mtrr/generic.c to kernel-doc
x86: Documentation/i386/IO-APIC.txt: fix description
Diffstat (limited to 'arch/x86/kernel/mfgpt_32.c')
| -rw-r--r-- | arch/x86/kernel/mfgpt_32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 027fc067b399..b402c0f3f192 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
| 33 | #include <linux/module.h> | ||
| 33 | #include <asm/geode.h> | 34 | #include <asm/geode.h> |
| 34 | 35 | ||
| 35 | static struct mfgpt_timer_t { | 36 | static struct mfgpt_timer_t { |