Merge tag 'mvebu-fixes-3.18' of git://git.infradead.org/linux-mvebu into fixes

[cascardo/linux.git] / arch / x86 / xen / Kconfig

diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 01b9026..e88fda8 100644 (file)
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -7,7 +7,7 @@ config XEN
        depends on PARAVIRT
        select PARAVIRT_CLOCK
        select XEN_HAVE_PVMMU
-       depends on X86_64 || (X86_32 && X86_PAE && !X86_VISWS)
+       depends on X86_64 || (X86_32 && X86_PAE)
        depends on X86_TSC
        help
          This is the Linux Xen port.  Enabling this will allow the
@@ -19,11 +19,6 @@ config XEN_DOM0
        depends on XEN && PCI_XEN && SWIOTLB_XEN
        depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI
 
-# Dummy symbol since people have come to rely on the PRIVILEGED_GUEST
-# name in tools.
-config XEN_PRIVILEGED_GUEST
-       def_bool XEN_DOM0
-
 config XEN_PVHVM
        def_bool y
        depends on XEN && PCI && X86_LOCAL_APIC