summaryrefslogtreecommitdiffstats
path: root/arch/i386/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
commit33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch)
tree2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /arch/i386/config.in
parent216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff)
Merge with Linux 2.3.32.
Diffstat (limited to 'arch/i386/config.in')
-rw-r--r--arch/i386/config.in6
1 files changed, 5 insertions, 1 deletions
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