]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Pull esi-support into release branch
authorTony Luck <tony.luck@intel.com>
Tue, 26 Sep 2006 16:47:30 +0000 (09:47 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 26 Sep 2006 16:47:30 +0000 (09:47 -0700)
1  2 
arch/ia64/Kconfig
arch/ia64/kernel/Makefile
arch/ia64/kernel/ia64_ksyms.c

Simple merge
index ad8215a3c586948f3cf92c2e6c80f31a5ff36aa5,66ac8e3dca9ca71c5784be03995adf9e051dc870..31497496eb4bf2d2353b99970f84688ec8959a73
@@@ -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
  
Simple merge