diff options
-rw-r--r-- | arch/sh64/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/sh64/mm/Makefile | 4 | ||||
-rw-r--r-- | arch/sh64/mm/consistent.c (renamed from arch/sh64/kernel/pci-dma.c) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh64/kernel/Makefile b/arch/sh64/kernel/Makefile index 5816657c079c..e3467bda6167 100644 --- a/arch/sh64/kernel/Makefile +++ b/arch/sh64/kernel/Makefile | |||
@@ -25,7 +25,7 @@ obj-$(CONFIG_SH_DMA) += dma.o | |||
25 | obj-$(CONFIG_SH_FPU) += fpu.o | 25 | obj-$(CONFIG_SH_FPU) += fpu.o |
26 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 26 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
27 | obj-$(CONFIG_KALLSYMS) += unwind.o | 27 | obj-$(CONFIG_KALLSYMS) += unwind.o |
28 | obj-$(CONFIG_PCI) += pci-dma.o pcibios.o | 28 | obj-$(CONFIG_PCI) += pcibios.o |
29 | obj-$(CONFIG_MODULES) += module.o | 29 | obj-$(CONFIG_MODULES) += module.o |
30 | 30 | ||
31 | ifeq ($(CONFIG_PCI),y) | 31 | ifeq ($(CONFIG_PCI),y) |
diff --git a/arch/sh64/mm/Makefile b/arch/sh64/mm/Makefile index ff19378ac90a..d0e813632480 100644 --- a/arch/sh64/mm/Makefile +++ b/arch/sh64/mm/Makefile | |||
@@ -13,7 +13,8 @@ | |||
13 | # unless it's something special (ie not a .c file). | 13 | # unless it's something special (ie not a .c file). |
14 | # | 14 | # |
15 | 15 | ||
16 | obj-y := init.o fault.o ioremap.o extable.o cache.o tlbmiss.o tlb.o | 16 | obj-y := cache.o consistent.o extable.o fault.o init.o ioremap.o \ |
17 | tlbmiss.o tlb.o | ||
17 | 18 | ||
18 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o | 19 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o |
19 | 20 | ||
@@ -41,4 +42,3 @@ CFLAGS_tlbmiss.o += -ffixed-r7 \ | |||
41 | -ffixed-r41 -ffixed-r42 -ffixed-r43 \ | 42 | -ffixed-r41 -ffixed-r42 -ffixed-r43 \ |
42 | -ffixed-r60 -ffixed-r61 -ffixed-r62 \ | 43 | -ffixed-r60 -ffixed-r61 -ffixed-r62 \ |
43 | -fomit-frame-pointer | 44 | -fomit-frame-pointer |
44 | |||
diff --git a/arch/sh64/kernel/pci-dma.c b/arch/sh64/mm/consistent.c index 8875a2a40da7..8875a2a40da7 100644 --- a/arch/sh64/kernel/pci-dma.c +++ b/arch/sh64/mm/consistent.c | |||