From: Tony Luck <tony.luck@intel.com>
Date: Tue, 26 Sep 2006 16:47:30 +0000 (-0700)
Subject: Pull esi-support into release branch
X-Git-Tag: v2.6.19-rc1~901^2~15
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=a4b47ab9464a8200528fad3101668abdd7379cf9;p=~andy%2Flinux

Pull esi-support into release branch
---

a4b47ab9464a8200528fad3101668abdd7379cf9
diff --cc arch/ia64/kernel/Makefile
index ad8215a3c58,66ac8e3dca9..31497496eb4
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@@ -29,9 -29,13 +29,14 @@@ obj-$(CONFIG_CPU_FREQ)		+= cpufreq
  obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o
  obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o
  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