diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-04-30 16:55:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 16:55:43 -0400 |
| commit | e0cc09e295f346b7921e921f385fe5213472316a (patch) | |
| tree | 3705c5bbd44afc235f39697a5b0c00d0d020188c /arch/ia64/kernel/Makefile | |
| parent | 40caf5ea5a7d47f8a33e26b63ca81dea4b5109d2 (diff) | |
| parent | e1b43bd556a611584a65f529e5077c1b54ace4f7 (diff) | |
Pull error-inject into release branch
Diffstat (limited to 'arch/ia64/kernel/Makefile')
| -rw-r--r-- | arch/ia64/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 098ee605bf5e..33e5a598672d 100644 --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile | |||
| @@ -34,6 +34,7 @@ obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o | |||
| 34 | obj-$(CONFIG_AUDIT) += audit.o | 34 | obj-$(CONFIG_AUDIT) += audit.o |
| 35 | obj-$(CONFIG_PCI_MSI) += msi_ia64.o | 35 | obj-$(CONFIG_PCI_MSI) += msi_ia64.o |
| 36 | mca_recovery-y += mca_drv.o mca_drv_asm.o | 36 | mca_recovery-y += mca_drv.o mca_drv_asm.o |
| 37 | obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o | ||
| 37 | 38 | ||
| 38 | obj-$(CONFIG_IA64_ESI) += esi.o | 39 | obj-$(CONFIG_IA64_ESI) += esi.o |
| 39 | ifneq ($(CONFIG_IA64_ESI),) | 40 | ifneq ($(CONFIG_IA64_ESI),) |