diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
| commit | 435462c6e639065460e91903d6bd2af0f5762fde (patch) | |
| tree | bf66ccdd613019035ebab535762366aa1026399b /arch/powerpc/mm/Makefile | |
| parent | d7b41b1fdf162d3e26cb73bf2cf14816918e371e (diff) | |
| parent | b5c42bc8db17db80917f99205a03c51f17354495 (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/mm/Makefile')
| -rw-r--r-- | arch/powerpc/mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index 17290bcedc5e..b746f4ca4209 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile | |||
| @@ -26,3 +26,4 @@ obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o | |||
| 26 | obj-$(CONFIG_PPC_MM_SLICES) += slice.o | 26 | obj-$(CONFIG_PPC_MM_SLICES) += slice.o |
| 27 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o | 27 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o |
| 28 | obj-$(CONFIG_PPC_SUBPAGE_PROT) += subpage-prot.o | 28 | obj-$(CONFIG_PPC_SUBPAGE_PROT) += subpage-prot.o |
| 29 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o | ||