diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 02:44:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 02:44:30 -0700 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /arch/h8300/mm/init.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/h8300/mm/init.c')
| -rw-r--r-- | arch/h8300/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c index 9942f24aff9..7cc3380f250 100644 --- a/arch/h8300/mm/init.c +++ b/arch/h8300/mm/init.c @@ -30,7 +30,7 @@ #include <linux/highmem.h> #include <linux/pagemap.h> #include <linux/bootmem.h> -#include <linux/slab.h> +#include <linux/gfp.h> #include <asm/setup.h> #include <asm/segment.h> |