diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /mm/page_isolation.c | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff) | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'mm/page_isolation.c')
| -rw-r--r-- | mm/page_isolation.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 3444b58033c8..c69f84fe038d 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * linux/mm/page_isolation.c | 2 | * linux/mm/page_isolation.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <stddef.h> | ||
| 6 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 7 | #include <linux/page-isolation.h> | 6 | #include <linux/page-isolation.h> |
| 8 | #include <linux/pageblock-flags.h> | 7 | #include <linux/pageblock-flags.h> |