1 files changed, 8 insertions, 16 deletions
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
index 681abe0a4594..ea88955d97ff 100644
--- a/arch/sparc/mm/Makefile
+++ b/arch/sparc/mm/Makefile
@@ -1,25 +1,17 @@
 # Makefile for the linux Sparc-specific parts of the memory manager.
 #
 
-asflags-y := -ansi
-ccflags-y := -Werror
+EXTRA_AFLAGS := -ansi
 
-obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
-obj-y                   += fault_$(BITS).o
-obj-y                   += init_$(BITS).o
-obj-$(CONFIG_SPARC32)   += loadmmu.o
-obj-y                   += generic_$(BITS).o
-obj-$(CONFIG_SPARC32)   += extable.o btfixup.o srmmu.o iommu.o io-unit.o
-obj-$(CONFIG_SPARC32)   += hypersparc.o viking.o tsunami.o swift.o
+obj-y	:= fault.o init.o loadmmu.o generic.o extable.o btfixup.o \
+	    srmmu.o iommu.o io-unit.o hypersparc.o viking.o tsunami.o swift.o
 
-# Only used by sparc64
-obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-
-# Only used by sparc32
-obj-$(CONFIG_HIGHMEM)   += highmem.o
+ifdef CONFIG_HIGHMEM
+obj-y	+= highmem.o
+endif
 
 ifdef CONFIG_SMP
-obj-$(CONFIG_SPARC32) += nosun4c.o
+obj-y   += nosun4c.o
 else
-obj-$(CONFIG_SPARC32) += sun4c.o
+obj-y   += sun4c.o
 endif