Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

[pandora-kernel.git] / arch / ia64 / kernel / acpi.c

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 3be485a..bfb4d01 100644 (file)
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -88,7 +88,7 @@ acpi_get_sysname(void)
        struct acpi_table_rsdp *rsdp;
        struct acpi_table_xsdt *xsdt;
        struct acpi_table_header *hdr;
-#ifdef CONFIG_DMAR
+#ifdef CONFIG_INTEL_IOMMU
        u64 i, nentries;
 #endif
 
@@ -125,7 +125,7 @@ acpi_get_sysname(void)
                return "xen";
        }
 
-#ifdef CONFIG_DMAR
+#ifdef CONFIG_INTEL_IOMMU
        /* Look for Intel IOMMU */
        nentries = (hdr->length - sizeof(*hdr)) /
                         sizeof(xsdt->table_offset_entry[0]);