summaryrefslogtreecommitdiffstats
path: root/arch/i386/config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-07-29 03:58:24 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-07-29 03:58:24 +0000
commit1c5c0c934f91fbce2825acbb849e98781e774c1d (patch)
tree12b5ae03516d4103bc070e4579ae1f7f71c27d24 /arch/i386/config.in
parent4fe70c31de87823ac9e804f4795589ba74dc6971 (diff)
Merge with 2.1.47. Some more cleanup and module fixes.
Diffstat (limited to 'arch/i386/config.in')
-rw-r--r--arch/i386/config.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in
index 1612b614f..887407c61 100644
--- a/arch/i386/config.in
+++ b/arch/i386/config.in
@@ -46,7 +46,10 @@ choice 'Processor type' \
PPro CONFIG_M686" Pentium
bool 'Video mode selection support' CONFIG_VIDEO_SELECT
-tristate 'Parallel port support' CONFIG_PNP_PARPORT
+tristate 'Parallel port support' CONFIG_PARPORT
+if [ "$CONFIG_PARPORT" != "n" ]; then
+ dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT
+fi
endmenu