From 7f6cac8472e7cd136a77f99dab6ec23c1758f9be Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Thu, 26 Jun 2008 21:27:54 +0200 Subject: [PATCH] --- yaml --- r: 99617 b: refs/heads/master c: 000fca2dfcfbd2859fed1208c38c899ab4873049 h: refs/heads/master i: 99615: c0328733a0cb3d5cd72db8cff94ac8ce00658e4a v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3106267a90d5..f2042f0c9881 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6c02715cff8c96174022166bfa3e1a25436fb34 +refs/heads/master: 000fca2dfcfbd2859fed1208c38c899ab4873049 diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index 1e4e00aca18c..b34e0bb18b60 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -100,7 +100,7 @@ ifeq ($(CONFIG_X86_64),y) obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o - obj-$(CONFIG_AMD_IOMMU) += amd_iommu_init.o + obj-$(CONFIG_AMD_IOMMU) += amd_iommu_init.o amd_iommu.o obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o