aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/kernel/Makefile
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-09-26 09:47:30 -0700
committerTony Luck <tony.luck@intel.com>2006-09-26 09:47:30 -0700
commita4b47ab9464a8200528fad3101668abdd7379cf9 (patch)
treedbf522f1be3ecac23885e44c9864af77a641efdc /arch/ia64/kernel/Makefile
parentae3e0218621db0590163b2d5c424ef1f340e3cc6 (diff)
parent2ab561a116e16cdee3ae0e13d51910634c15aee9 (diff)
downloadlinux-stericsson-a4b47ab9464a8200528fad3101668abdd7379cf9.tar.gz
Pull esi-support into release branch
Diffstat (limited to 'arch/ia64/kernel/Makefile')
-rw-r--r--arch/ia64/kernel/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index ad8215a3c586..31497496eb4b 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -32,6 +32,11 @@ obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o
obj-$(CONFIG_AUDIT) += audit.o
mca_recovery-y += mca_drv.o mca_drv_asm.o
+obj-$(CONFIG_IA64_ESI) += esi.o
+ifneq ($(CONFIG_IA64_ESI),)
+obj-y += esi_stub.o # must be in kernel proper
+endif
+
# The gate DSO image is built using a special linker script.
targets += gate.so gate-syms.o