summaryrefslogtreecommitdiffstats
path: root/arch/frv/kernel/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-01-06 21:59:59 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-06 21:59:59 +0100
commitccf18968b1bbc2fb117190a1984ac2a826dac228 (patch)
tree7bc8fbf5722aecf1e84fa50c31c657864cba1daa /arch/frv/kernel/Makefile
parent[PATCH] i2c: i2c-mv64xxx fix transaction abortion (diff)
parentMerge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block (diff)
downloadlinux-ccf18968b1bbc2fb117190a1984ac2a826dac228.tar.xz
linux-ccf18968b1bbc2fb117190a1984ac2a826dac228.zip
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/frv/kernel/Makefile')
-rw-r--r--arch/frv/kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/frv/kernel/Makefile b/arch/frv/kernel/Makefile
index 981c2c7dec0d..422f30ede575 100644
--- a/arch/frv/kernel/Makefile
+++ b/arch/frv/kernel/Makefile
@@ -20,3 +20,4 @@ obj-$(CONFIG_FUJITSU_MB93493) += irq-mb93493.o
obj-$(CONFIG_PM) += pm.o cmode.o
obj-$(CONFIG_MB93093_PDK) += pm-mb93093.o
obj-$(CONFIG_SYSCTL) += sysctl.o
+obj-$(CONFIG_FUTEX) += futex.o