diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-16 11:52:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-16 11:52:43 -0700 |
| commit | c8988f968240069aeae16d8cf9f59096a085eb27 (patch) | |
| tree | 5d75d8b6014353caf5ad9db2d189cd6427c80488 /arch/ia64/Makefile | |
| parent | 10acaf0c8a481c1ea9ba9d550a292595d8279ee1 (diff) | |
| parent | 732a675a6303156d1a197dc780b0712bd4b49d46 (diff) | |
| download | kernel_samsung_aries-c8988f968240069aeae16d8cf9f59096a085eb27.zip kernel_samsung_aries-c8988f968240069aeae16d8cf9f59096a085eb27.tar.gz kernel_samsung_aries-c8988f968240069aeae16d8cf9f59096a085eb27.tar.bz2 | |
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] Fix CONFIG_IA64_SGI_UV build error
[IA64] Update check_sal_cache_flush to use platform_send_ipi()
[IA64] perfmon: fix async exit bug
Diffstat (limited to 'arch/ia64/Makefile')
| -rw-r--r-- | arch/ia64/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 88f1a55..e67ee3f 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -57,6 +57,7 @@ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ +core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ core-$(CONFIG_KVM) += arch/ia64/kvm/ drivers-$(CONFIG_PCI) += arch/ia64/pci/ |