diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 19:37:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 19:37:06 +0100 |
| commit | 9b8ab9f6c37c610feea20edfb357a3b8a43d39bd (patch) | |
| tree | 02d18c920a03a600e915d66d6a471d900857b3ac /arch/i386/kernel/acpi/cstate.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [PATCH] severing poll.h -> mm.h (diff) | |
| download | linux-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.tar.xz linux-9b8ab9f6c37c610feea20edfb357a3b8a43d39bd.zip | |
Merge branch 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird
* 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird:
[PATCH] severing poll.h -> mm.h
[PATCH] severing skbuff.h -> mm.h
[PATCH] severing skbuff.h -> poll.h
[PATCH] severing skbuff.h -> highmem.h
[PATCH] severing uaccess.h -> sched.h
[PATCH] severing fs.h, radix-tree.h -> sched.h
[PATCH] severing module.h->sched.h
Diffstat (limited to 'arch/i386/kernel/acpi/cstate.c')
| -rw-r--r-- | arch/i386/kernel/acpi/cstate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/i386/kernel/acpi/cstate.c index 20563e52c622..4664b55f623e 100644 --- a/arch/i386/kernel/acpi/cstate.c +++ b/arch/i386/kernel/acpi/cstate.c @@ -11,6 +11,7 @@ #include <linux/init.h> #include <linux/acpi.h> #include <linux/cpu.h> +#include <linux/sched.h> #include <acpi/processor.h> #include <asm/acpi.h> |