diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:49 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:49 +0200 |
commit | cbd6712406a3ea861b49fbfd46e23cbf5f8e073f (patch) | |
tree | b519cb0f279cd844886df062b3c7ce439912b4ed /arch/ia64/Makefile | |
parent | d939d2851fd12568e2eabb2916769e8a57ba5c89 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into x86/irqtip-x86-irq-2008-06-25_10.30_Wed
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 88f1a55c6c94..e67ee3f27698 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/ |