diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 12:57:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 12:57:54 -0400 |
| commit | 4937ce87959629d31e9b09cf5bdf1e12a305c805 (patch) | |
| tree | f5b93ec4f8271c7109bbd61e09c788e0be7caa85 /arch/ia64/hp/common/Makefile | |
| parent | 4271e0f7e12bdbbd7ce131187aaae2ba5233a309 (diff) | |
| parent | 432a7d6587fc5028421342785f6c9552c9fba175 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] update sn2_defconfig
[IA64] Fix kernel hangup in kdump on INIT
[IA64] Fix kernel panic in kdump on INIT
[IA64] Remove vector from ia64_machine_kexec()
[IA64] Fix race when multiple cpus go through MCA
[IA64] Remove needless delay in MCA rendezvous
[IA64] add driver for ACPI methods to call native firmware
[IA64] abstract SAL_CALL wrapper to allow other firmware entry points
[IA64] perfmon: Remove exit_pfm_fs()
[IA64] tree-wide: Misc __cpu{initdata, init, exit} annotations
Diffstat (limited to 'arch/ia64/hp/common/Makefile')
| -rw-r--r-- | arch/ia64/hp/common/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/hp/common/Makefile b/arch/ia64/hp/common/Makefile index f61a60057ff7..9e179dd06b85 100644 --- a/arch/ia64/hp/common/Makefile +++ b/arch/ia64/hp/common/Makefile | |||
| @@ -8,3 +8,4 @@ | |||
| 8 | obj-y := sba_iommu.o | 8 | obj-y := sba_iommu.o |
| 9 | obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += hwsw_iommu.o | 9 | obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += hwsw_iommu.o |
| 10 | obj-$(CONFIG_IA64_GENERIC) += hwsw_iommu.o | 10 | obj-$(CONFIG_IA64_GENERIC) += hwsw_iommu.o |
| 11 | obj-$(CONFIG_IA64_HP_AML_NFW) += aml_nfw.o | ||