From a77dcc4d84afd4e12f6f2f11925ef7086062f721 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 27 May 2009 13:36:10 +1000 Subject: [PATCH] --- yaml --- r: 145321 b: refs/heads/master c: b16e7766d6436835f473ba823ad04fbdfe5e9cbd h: refs/heads/master i: 145319: dd314a36a56a603a9fbca70478ce77f0e64e07fa v: v3 --- [refs] | 2 +- trunk/arch/powerpc/lib/Makefile | 1 - trunk/arch/powerpc/mm/Makefile | 1 + trunk/arch/powerpc/{lib => mm}/dma-noncoherent.c | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/powerpc/{lib => mm}/dma-noncoherent.c (100%) diff --git a/[refs] b/[refs] index 5564f2bdf7e0..8f76024799af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84532a0fc3d5811dca8e3726fe4d372ea87bd7c6 +refs/heads/master: b16e7766d6436835f473ba823ad04fbdfe5e9cbd diff --git a/trunk/arch/powerpc/lib/Makefile b/trunk/arch/powerpc/lib/Makefile index 8db35278a4b4..29b742b90f1f 100644 --- a/trunk/arch/powerpc/lib/Makefile +++ b/trunk/arch/powerpc/lib/Makefile @@ -18,7 +18,6 @@ obj-$(CONFIG_PPC64) += copypage_64.o copyuser_64.o \ memcpy_64.o usercopy_64.o mem_64.o string.o obj-$(CONFIG_XMON) += sstep.o obj-$(CONFIG_KPROBES) += sstep.o -obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o ifeq ($(CONFIG_PPC64),y) obj-$(CONFIG_SMP) += locks.o diff --git a/trunk/arch/powerpc/mm/Makefile b/trunk/arch/powerpc/mm/Makefile index 17290bcedc5e..b746f4ca4209 100644 --- a/trunk/arch/powerpc/mm/Makefile +++ b/trunk/arch/powerpc/mm/Makefile @@ -26,3 +26,4 @@ obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o obj-$(CONFIG_PPC_MM_SLICES) += slice.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_PPC_SUBPAGE_PROT) += subpage-prot.o +obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o diff --git a/trunk/arch/powerpc/lib/dma-noncoherent.c b/trunk/arch/powerpc/mm/dma-noncoherent.c similarity index 100% rename from trunk/arch/powerpc/lib/dma-noncoherent.c rename to trunk/arch/powerpc/mm/dma-noncoherent.c