x86, VisWS: turn into generic arch, eliminate Kconfig specials

remove leftover traces of various VISWS related Kconfig specials.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig
index 964dfa36d3679155bcbf4de5068c08ad264c867d..c70e12b1a6375bbe1eed42195cdfff320eaa07e4 100644 (file)
--- a/arch/x86/lguest/Kconfig
+++ b/arch/x86/lguest/Kconfig
@@ -3,7 +3,7 @@ config LGUEST_GUEST
        select PARAVIRT
        depends on X86_32
        depends on !X86_PAE
-       depends on !(X86_VISWS || X86_VOYAGER)
+       depends on !X86_VOYAGER
        select VIRTIO
        select VIRTIO_RING
        select VIRTIO_CONSOLE

diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index b8054c3ffce376d2e2440af1dc132323efe239f2..48278fa7d3dee05eeaf2ccfa9bb8c726f6dd2f84 100644 (file)
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -81,7 +81,7 @@ void __init intr_init_hook(void)
  *
  * Description:
  *     generally used to activate any machine specific identification
- *     routines that may be needed before setup_arch() runs.  On VISWS
+ *     routines that may be needed before setup_arch() runs.  On Voyager
  *     this is used to get the board revision and type.
  **/
 void __init pre_setup_arch_hook(void)

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 860f15f36ce926290f94dc0f6b13762408734798..bba867391a85bff4c08f9e61632026084cf59cea 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -4,7 +4,6 @@
 
 menuconfig ACPI
        bool "ACPI (Advanced Configuration and Power Interface) Support"
-       depends on !X86_VISWS
        depends on !IA64_HP_SIM
        depends on IA64 || X86
        depends on PCI

diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 6b8dbb9ba73bbedf67aa06d756dfc94d2a66d663..76f2b36881c3b43871533399cc242b4dfd24cd43 100644 (file)
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
        tristate "Linux hypervisor example code"
-       depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
+       depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !X86_VOYAGER
        select HVC_DRIVER
        ---help---
          This is a very simple module which allows you to run