diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
---|---|---|
committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /arch/i386/config.in | |
parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'arch/i386/config.in')
-rw-r--r-- | arch/i386/config.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index a5b72a4d0..f95590407 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -23,14 +23,15 @@ comment 'General setup' bool 'Kernel math emulation' CONFIG_MATH_EMULATION bool 'Networking support' CONFIG_NET -bool 'Limit memory to low 16MB' CONFIG_MAX_16M bool 'PCI bios support' CONFIG_PCI if [ "$CONFIG_PCI" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool ' PCI bridge optimization (experimental)' CONFIG_PCI_OPTIMIZE fi fi +bool 'MCA support' CONFIG_MCA bool 'System V IPC' CONFIG_SYSVIPC +bool 'Sysctl support' CONFIG_SYSCTL tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then @@ -43,8 +44,13 @@ choice 'Processor type' \ Pentium CONFIG_M586 \ PPro CONFIG_M686" Pentium bool 'Video mode selection support' CONFIG_VIDEO_SELECT + +tristate 'Parallel port support' CONFIG_PNP_PARPORT + endmenu +source drivers/pnp/Config.in + source drivers/block/Config.in if [ "$CONFIG_NET" = "y" ]; then |