diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /include/asm-i386/pgalloc.h | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-i386/pgalloc.h')
| -rw-r--r-- | include/asm-i386/pgalloc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/pgalloc.h b/include/asm-i386/pgalloc.h index c8dc2d0141a7..47430175b75f 100644 --- a/include/asm-i386/pgalloc.h +++ b/include/asm-i386/pgalloc.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _I386_PGALLOC_H | 1 | #ifndef _I386_PGALLOC_H |
| 2 | #define _I386_PGALLOC_H | 2 | #define _I386_PGALLOC_H |
| 3 | 3 | ||
| 4 | #include <asm/fixmap.h> | ||
| 5 | #include <linux/threads.h> | 4 | #include <linux/threads.h> |
| 6 | #include <linux/mm.h> /* for struct page */ | 5 | #include <linux/mm.h> /* for struct page */ |
| 7 | 6 | ||