upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / mips / Makefile

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index d90281a..bc1c442 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -481,6 +481,12 @@ load-$(CONFIG_NEC_OSPREY)  += 0xffffffff80002000
 core-$(CONFIG_MACH_VR41XX)     += arch/mips/vr41xx/common/
 cflags-$(CONFIG_MACH_VR41XX)   += -Iinclude/asm-mips/mach-vr41xx
 
+#
+# NEC VR4133
+#
+core-$(CONFIG_NEC_CMBVR4133)   += arch/mips/vr41xx/nec-cmbvr4133/
+load-$(CONFIG_NEC_CMBVR4133)   += 0xffffffff80100000
+
 #
 # ZAO Networks Capcella (VR4131)
 #
@@ -673,6 +679,8 @@ libs-$(CONFIG_MIPS64)       += arch/mips/lib-64/
 
 core-y                 += arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/
 
+drivers-$(CONFIG_OPROFILE)     += arch/mips/oprofile/
+
 ifdef CONFIG_LASAT
 rom.bin rom.sw: vmlinux
        $(call descend,arch/mips/lasat/image,$@)
@@ -744,36 +752,16 @@ define filechk_gen-asm-offset.h
         echo "#endif /* _ASM_OFFSET_H */" )
 endef
 
-define filechk_gen-asm-reg.h
-       (set -e; \
-        echo "#ifndef _ASM_REG_H"; \
-        echo "#define _ASM_REG_H"; \
-        echo "/*"; \
-        echo " * DO NOT MODIFY."; \
-        echo " *"; \
-        echo " * This file was generated by arch/$(ARCH)/Makefile"; \
-        echo " *"; \
-        echo " */"; \
-        echo ""; \
-        sed -ne "/^@@@/s///p"; \
-        echo "#endif /* _ASM_REG_H */" )
-endef
-
-prepare: include/asm-$(ARCH)/offset.h \
-        include/asm-$(ARCH)/reg.h
+prepare: include/asm-$(ARCH)/offset.h
 
 arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \
                                   include/config/MARKER
 
 include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s
        $(call filechk,gen-asm-offset.h)
-include/asm-$(ARCH)/reg.h: arch/$(ARCH)/kernel/reg.s
-       $(call filechk,gen-asm-reg.h)
 
 CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \
               include/asm-$(ARCH)/offset.h \
-              include/asm-$(ARCH)/reg.h.tmp \
-              include/asm-$(ARCH)/reg.h \
               vmlinux.32 \
               vmlinux.64 \
               vmlinux.ecoff