diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 13:37:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 13:37:06 -0500 |
| commit | 9b8ab9f6c37c610feea20edfb357a3b8a43d39bd (patch) | |
| tree | 02d18c920a03a600e915d66d6a471d900857b3ac /arch/i386/kernel/alternative.c | |
| parent | 12472b4165a21f5415ff4f60f8f46311a6b7b9ac (diff) | |
| parent | f23f6e08c47acbdd20e9c49a79da8c404ea168e1 (diff) | |
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/alternative.c')
| -rw-r--r-- | arch/i386/kernel/alternative.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c index 583c238e17fb..535f9794fba1 100644 --- a/arch/i386/kernel/alternative.c +++ b/arch/i386/kernel/alternative.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 2 | #include <linux/sched.h> | ||
| 2 | #include <linux/spinlock.h> | 3 | #include <linux/spinlock.h> |
| 3 | #include <linux/list.h> | 4 | #include <linux/list.h> |
| 4 | #include <asm/alternative.h> | 5 | #include <asm/alternative.h> |