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/i386/config.in | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'arch/i386/config.in')
| -rw-r--r-- | arch/i386/config.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index 36f1aafda..664b77800 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -6,6 +6,7 @@ mainmenu_name "Linux Kernel Configuration" define_bool CONFIG_X86 y define_bool CONFIG_ISA y +define_bool CONFIG_SBUS n define_bool CONFIG_UID16 y @@ -43,11 +44,17 @@ if [ "$CONFIG_M486" = "y" -o "$CONFIG_M586" = "y" ]; then define_bool CONFIG_X86_USE_STRING_486 y define_bool CONFIG_X86_ALIGNMENT_16 y fi -if [ "$CONFIG_M586TSC" = "y" -o "$CONFIG_MK6" = "y" ]; then +if [ "$CONFIG_M586TSC" = "y" ]; then define_bool CONFIG_X86_USE_STRING_486 y define_bool CONFIG_X86_ALIGNMENT_16 y define_bool CONFIG_X86_TSC y fi +if [ "$CONFIG_MK6" = "y" ]; then + define_bool CONFIG_X86_ALIGNMENT_16 y + define_bool CONFIG_X86_TSC y + define_bool CONFIG_X86_USE_3DNOW y + define_bool CONFIG_X86_USE_PPRO_CHECKSUM y +fi if [ "$CONFIG_M686" = "y" ]; then define_bool CONFIG_X86_TSC y define_bool CONFIG_X86_GOOD_APIC y @@ -136,6 +143,8 @@ 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 bool 'System V IPC' CONFIG_SYSVIPC @@ -252,7 +261,6 @@ endmenu source drivers/char/Config.in -source drivers/usb/Config.in #source drivers/misc/Config.in @@ -279,6 +287,8 @@ if [ "$CONFIG_SOUND" != "n" ]; then fi endmenu +source drivers/usb/Config.in + mainmenu_option next_comment comment 'Kernel hacking' |