diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:02:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 12:55:47 -0400 |
commit | 15e551d25e5a600c76cb92171357d4cbe2d1bf7a (patch) | |
tree | 8a28438fbed1aba7f57e2527b40c98452258b827 /arch/x86 | |
parent | 62fa572f6933038b3d79558812de88702bda176f (diff) |
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>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/lguest/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/mach-default/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig index 964dfa36d367..c70e12b1a637 100644 --- a/arch/x86/lguest/Kconfig +++ b/arch/x86/lguest/Kconfig | |||
@@ -3,7 +3,7 @@ config LGUEST_GUEST | |||
3 | select PARAVIRT | 3 | select PARAVIRT |
4 | depends on X86_32 | 4 | depends on X86_32 |
5 | depends on !X86_PAE | 5 | depends on !X86_PAE |
6 | depends on !(X86_VISWS || X86_VOYAGER) | 6 | depends on !X86_VOYAGER |
7 | select VIRTIO | 7 | select VIRTIO |
8 | select VIRTIO_RING | 8 | select VIRTIO_RING |
9 | select VIRTIO_CONSOLE | 9 | select VIRTIO_CONSOLE |
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c index b8054c3ffce3..48278fa7d3de 100644 --- a/arch/x86/mach-default/setup.c +++ b/arch/x86/mach-default/setup.c | |||
@@ -81,7 +81,7 @@ void __init intr_init_hook(void) | |||
81 | * | 81 | * |
82 | * Description: | 82 | * Description: |
83 | * generally used to activate any machine specific identification | 83 | * generally used to activate any machine specific identification |
84 | * routines that may be needed before setup_arch() runs. On VISWS | 84 | * routines that may be needed before setup_arch() runs. On Voyager |
85 | * this is used to get the board revision and type. | 85 | * this is used to get the board revision and type. |
86 | **/ | 86 | **/ |
87 | void __init pre_setup_arch_hook(void) | 87 | void __init pre_setup_arch_hook(void) |