diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /arch/ia64/config.in | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'arch/ia64/config.in')
| -rw-r--r-- | arch/ia64/config.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/ia64/config.in b/arch/ia64/config.in index b0d924d14..b7cce3d73 100644 --- a/arch/ia64/config.in +++ b/arch/ia64/config.in @@ -4,6 +4,8 @@ mainmenu_option next_comment comment 'General setup' define_bool CONFIG_IA64 y +define_bool CONFIG_ISA n +define_bool CONFIG_SBUS n choice 'IA-64 system type' \ "Generic CONFIG_IA64_GENERIC \ @@ -50,7 +52,12 @@ tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC bool 'PCI support' CONFIG_PCI source drivers/pci/Config.in -source drivers/pcmcia/Config.in +bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG +if [ "$CONFIG_HOTPLUG" = "y" ]; then + source drivers/pcmcia/Config.in +else + define_bool CONFIG_PCMCIA n +fi mainmenu_option next_comment comment 'Code maturity level options' @@ -134,7 +141,6 @@ fi endmenu source drivers/char/Config.in -source drivers/usb/Config.in #source drivers/misc/Config.in source fs/Config.in @@ -161,6 +167,8 @@ if [ "$CONFIG_SOUND" != "n" ]; then fi endmenu +source drivers/usb/Config.in + mainmenu_option next_comment comment 'Kernel hacking' |