From 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 4 Feb 2000 07:40:19 +0000 Subject: Merge with Linux 2.3.32. --- arch/i386/config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'arch/i386/config.in') diff --git a/arch/i386/config.in b/arch/i386/config.in index 03433d968..4a09997b2 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -95,8 +95,12 @@ else define_bool CONFIG_PCI_DIRECT y fi fi - bool 'MCA support' CONFIG_MCA +fi +source drivers/pci/Config.in + +if [ "$CONFIG_VISWS" != "y" ]; then + bool 'MCA support' CONFIG_MCA fi source drivers/pcmcia/Config.in -- cgit v1.2.3