summaryrefslogtreecommitdiff
path: root/arch/cris/kernel
diff options
context:
space:
mode:
authorMikael Starvik <mikael.starvik@axis.com>2005-07-27 11:44:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:25:59 -0700
commit3e41d6522a6922a95f9d953f4171b45b82b3d6f4 (patch)
tree61f406f442ec3db540322c802d06a67f8dbd8eb7 /arch/cris/kernel
parentcb09f540a1c5e6c5beb6e82f554d51a1f2c87e67 (diff)
[PATCH] CRIS update: configuration and build
Changes to configuration and build system. * Added v32 sub architecture. * Use generic hard IRQ. * Added SMP options. * Added options to OOPS at NMI and reboot at OOM. * Made it possible to set objtree. * Added option to select Kernel GDB serial port. * Corrected Kconfig usage. * Added system profiler. Signed-off-by: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/cris/kernel')
-rw-r--r--arch/cris/kernel/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile
index 1546a0e74047..c8e8ea570989 100644
--- a/arch/cris/kernel/Makefile
+++ b/arch/cris/kernel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 2004/05/14 10:18:12 starvik Exp $
+# $Id: Makefile,v 1.12 2004/10/19 13:07:43 starvik Exp $
#
# Makefile for the linux kernel.
#
@@ -10,6 +10,7 @@ obj-y := process.o traps.o irq.o ptrace.o setup.o \
obj-$(CONFIG_MODULES) += crisksyms.o
obj-$(CONFIG_MODULES) += module.o
+obj-$(CONFIG_SYSTEM_PROFILER) += profile.o
clean: