diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-04-13 00:28:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 00:28:45 -0700 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /arch/blackfin/include/asm/mmu_context.h | |
| parent | sparc64: Fix memory leak in pci_register_iommu_region(). (diff) | |
| parent | Linux 2.6.34-rc4 (diff) | |
| download | linux-dev-9343af084c7e8911897b0883042ee690cee3aaef.tar.xz linux-dev-9343af084c7e8911897b0883042ee690cee3aaef.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/blackfin/include/asm/mmu_context.h')
| -rw-r--r-- | arch/blackfin/include/asm/mmu_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h index 7f363d7e43a5..e1a9b4624f91 100644 --- a/arch/blackfin/include/asm/mmu_context.h +++ b/arch/blackfin/include/asm/mmu_context.h @@ -7,7 +7,7 @@ #ifndef __BLACKFIN_MMU_CONTEXT_H__ #define __BLACKFIN_MMU_CONTEXT_H__ -#include <linux/gfp.h> +#include <linux/slab.h> #include <linux/sched.h> #include <asm/setup.h> #include <asm/page.h> |