diff --git a/[refs] b/[refs] index d3a148001af8..4c69d89ec469 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb0923a66820718f636736b22ce47372f79e3400 +refs/heads/master: e786e86a542ccc1133f333402526ad00b9c088ae diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h index 1e8dddfb3083..b2067e4a4486 100644 --- a/trunk/include/linux/bootmem.h +++ b/trunk/include/linux/bootmem.h @@ -4,11 +4,8 @@ #ifndef _LINUX_BOOTMEM_H #define _LINUX_BOOTMEM_H -#include -#include -#include -#include #include +#include /* * simple boot-time physical memory area allocator. diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c index 9083f5029673..e136c086fd98 100644 --- a/trunk/mm/bootmem.c +++ b/trunk/mm/bootmem.c @@ -8,17 +8,13 @@ * free memory collector. It's used to deal with reserved * system memory and memory holes as well. */ - -#include -#include -#include -#include #include #include -#include #include -#include + +#include #include + #include "internal.h" /*