From 42d5f95d06b4e26cd7f0b5cfd1b34f54607610c8 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 1 Oct 2007 17:43:11 +0900 Subject: [PATCH] --- yaml --- r: 68314 b: refs/heads/master c: 049aa166b112beab77b9a2f8d9caa03b74843eab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh64/kernel/Makefile | 2 +- trunk/arch/sh64/mm/Makefile | 4 ++-- trunk/arch/sh64/{kernel/pci-dma.c => mm/consistent.c} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename trunk/arch/sh64/{kernel/pci-dma.c => mm/consistent.c} (100%) diff --git a/[refs] b/[refs] index 41e76462c154..8eb84bd82919 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 749c84966c990092da20203a80e0749b614c79a6 +refs/heads/master: 049aa166b112beab77b9a2f8d9caa03b74843eab diff --git a/trunk/arch/sh64/kernel/Makefile b/trunk/arch/sh64/kernel/Makefile index 5816657c079c..e3467bda6167 100644 --- a/trunk/arch/sh64/kernel/Makefile +++ b/trunk/arch/sh64/kernel/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_SH_DMA) += dma.o obj-$(CONFIG_SH_FPU) += fpu.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_KALLSYMS) += unwind.o -obj-$(CONFIG_PCI) += pci-dma.o pcibios.o +obj-$(CONFIG_PCI) += pcibios.o obj-$(CONFIG_MODULES) += module.o ifeq ($(CONFIG_PCI),y) diff --git a/trunk/arch/sh64/mm/Makefile b/trunk/arch/sh64/mm/Makefile index ff19378ac90a..d0e813632480 100644 --- a/trunk/arch/sh64/mm/Makefile +++ b/trunk/arch/sh64/mm/Makefile @@ -13,7 +13,8 @@ # unless it's something special (ie not a .c file). # -obj-y := init.o fault.o ioremap.o extable.o cache.o tlbmiss.o tlb.o +obj-y := cache.o consistent.o extable.o fault.o init.o ioremap.o \ + tlbmiss.o tlb.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o @@ -41,4 +42,3 @@ CFLAGS_tlbmiss.o += -ffixed-r7 \ -ffixed-r41 -ffixed-r42 -ffixed-r43 \ -ffixed-r60 -ffixed-r61 -ffixed-r62 \ -fomit-frame-pointer - diff --git a/trunk/arch/sh64/kernel/pci-dma.c b/trunk/arch/sh64/mm/consistent.c similarity index 100% rename from trunk/arch/sh64/kernel/pci-dma.c rename to trunk/arch/sh64/mm/consistent.c