Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[~andy/linux] / arch / ia64 / kernel / acpi.c

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 28dc6ba6690adf3910eec80135f76d44c1c4e98e..07d209c9507f292d80c45edc7b7433d78a78602b 100644 (file)
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -53,7 +53,6 @@
 #include <asm/numa.h>
 #include <asm/sal.h>
 #include <asm/cyclone.h>
-#include <asm/xen/hypervisor.h>
 
 #define BAD_MADT_ENTRY(entry, end) (                                        \
                (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
@@ -119,8 +118,6 @@ acpi_get_sysname(void)
                        return "uv";
                else
                        return "sn2";
-       } else if (xen_pv_domain() && !strcmp(hdr->oem_id, "XEN")) {
-               return "xen";
        }
 
 #ifdef CONFIG_INTEL_IOMMU