diff options
Diffstat (limited to 'arch/i386/config.in')
| -rw-r--r-- | arch/i386/config.in | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index 56b3fd802..136034f6f 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -4,6 +4,9 @@ # mainmenu_name "Linux Kernel Configuration" +define_bool CONFIG_X86 y +define_bool CONFIG_ISA y + mainmenu_option next_comment comment 'Code maturity level options' bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL @@ -54,6 +57,7 @@ endmenu mainmenu_option next_comment comment 'General setup' +bool 'BIGMEM support' CONFIG_BIGMEM bool 'Networking support' CONFIG_NET bool 'PCI support' CONFIG_PCI if [ "$CONFIG_PCI" = "y" ]; then @@ -67,11 +71,6 @@ if [ "$CONFIG_PCI" = "y" ]; then if [ "$CONFIG_PCI_GODIRECT" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then define_bool CONFIG_PCI_DIRECT y fi - bool ' PCI quirks' CONFIG_PCI_QUIRKS - if [ "$CONFIG_PCI_QUIRKS" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then - bool ' PCI bridge optimization (experimental)' CONFIG_PCI_OPTIMIZE - fi - bool ' Backward-compatible /proc/pci' CONFIG_PCI_OLD_PROC fi bool 'MCA support' CONFIG_MCA bool 'SGI Visual Workstation support' CONFIG_VISWS @@ -85,6 +84,8 @@ else fi fi +source drivers/pcmcia/Config.in + bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL @@ -92,10 +93,10 @@ tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC -source drivers/misc/Config.in +source drivers/parport/Config.in -bool 'Advanced Power Management BIOS support' CONFIG_APM -if [ "$CONFIG_APM" = "y" ]; then +tristate 'Advanced Power Management BIOS support' CONFIG_APM +if [ "$CONFIG_APM" != "n" ]; then bool ' Ignore USER SUSPEND' CONFIG_APM_IGNORE_USER_SUSPEND bool ' Enable PM at boot time' CONFIG_APM_DO_ENABLE bool ' Make CPU Idle calls when idle' CONFIG_APM_CPU_IDLE @@ -136,6 +137,9 @@ if [ "$CONFIG_NET" = "y" ]; then bool 'Network device support' CONFIG_NETDEVICES if [ "$CONFIG_NETDEVICES" = "y" ]; then source drivers/net/Config.in + if [ "$CONFIG_ATM" = "y" ]; then + source drivers/atm/Config.in + fi fi endmenu fi @@ -167,6 +171,8 @@ source drivers/char/Config.in source drivers/usb/Config.in +source drivers/misc/Config.in + source fs/Config.in if [ "$CONFIG_VT" = "y" ]; then |