From 002d3642bb024ab106e03a60f2b5105af65511a6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 23 Nov 2007 15:24:52 -0500 Subject: [PATCH] Linux 2.2.27-rc1 o CAN-2004-0497: fixed missing DAC check on sys_chown (Thomas Biege) o CAN-2004-1016: fixed a buffer overflow vulnerability (Paul Starzetz) in the "__scm_send" function which handles the sending of UDP network packets. A wrong validity check of the cmsghdr structure allowed a local attacker to modify kernel memory, thus causing an endless loop (DoS) or possibly even root privilege escalation. o CAN-2004-1333: fixed integer overflow in the vc_resize (Georgi Guninski) function allows local users to cause a denial of service (kernel crash) via a short new screen value, which leads to a buffer overflow. Make sure VC resizing fits in s16. o If the user makes ip_cmsg_send call ip_options_get (Georgi Guninski) multiple times, we leak kmalloced IP options data. o fixed moxa serial bound checking issue (Alan Cox) o menu cleanups (Marc-Christian Petersen) --- ChangeLog-2.2.27 | 22 ++ Makefile | 2 +- arch/alpha/config.in | 31 +-- arch/alpha/defconfig | 2 +- arch/arm/config.in | 47 ++-- arch/arm/defconfig | 2 +- arch/i386/config.in | 77 ++++--- arch/i386/defconfig | 2 +- arch/m68k/config.in | 12 +- arch/m68k/defconfig | 2 +- arch/mips/config.in | 44 ++-- arch/mips/defconfig | 2 +- arch/ppc/config.in | 26 +-- arch/ppc/defconfig | 2 +- arch/s390/config.in | 16 +- arch/sparc/config.in | 8 +- arch/sparc/defconfig | 2 +- arch/sparc64/config.in | 13 +- drivers/acorn/scsi/Config.in | 22 +- drivers/cdrom/Config.in | 28 +-- drivers/char/Config.in | 187 ++++++++-------- drivers/char/console.c | 6 + drivers/char/drm/Config.in | 3 + drivers/char/ftape/Config.in | 28 +-- drivers/char/hfmodem/Config.in | 6 +- drivers/char/moxa.c | 2 + drivers/net/Config.in | 274 +++++++++++------------ drivers/net/hamradio/Config.in | 24 ++- drivers/scsi/Config.in | 197 +++++++++-------- drivers/sound/Config.in | 359 ++++++++++++++++--------------- drivers/sound/lowlevel/Config.in | 50 ++--- drivers/telephony/Config.in | 2 +- drivers/video/Config.in | 166 +++++++------- fs/Config.in | 16 +- fs/attr.c | 3 +- fs/ncpfs/Config.in | 20 +- include/linux/socket.h | 4 + net/Config.in | 2 +- net/ax25/Config.in | 10 +- net/core/scm.c | 4 +- net/ipv4/Config.in | 16 +- net/ipv4/ip_options.c | 2 + net/ipv4/ip_sockglue.c | 5 +- net/ipv6/Config.in | 10 +- net/ipv6/datagram.c | 4 +- net/ipx/Config.in | 4 +- net/sched/Config.in | 36 ++-- 47 files changed, 932 insertions(+), 870 deletions(-) diff --git a/ChangeLog-2.2.27 b/ChangeLog-2.2.27 index ae30e386dd98..300d417aeb16 100644 --- a/ChangeLog-2.2.27 +++ b/ChangeLog-2.2.27 @@ -21,6 +21,28 @@ You may find more informations about it at http://www.wolk-project.de/ +2.2.27-rc1 +---------- +o CAN-2004-0497: fixed missing DAC check on sys_chown (Thomas Biege) +o CAN-2004-1016: fixed a buffer overflow vulnerability (Paul Starzetz) + in the "__scm_send" function which handles the sending + of UDP network packets. A wrong validity check of the + cmsghdr structure allowed a local attacker to modify + kernel memory, thus causing an endless loop (DoS) or + possibly even root privilege escalation. +o CAN-2004-1333: fixed integer overflow in the vc_resize (Georgi Guninski) + function allows local users to cause a denial of + service (kernel crash) via a short new screen value, + which leads to a buffer overflow. Make sure VC + resizing fits in s16. +o If the user makes ip_cmsg_send call ip_options_get (Georgi Guninski) + multiple times, we leak kmalloced IP options data. +o fixed moxa serial bound checking issue (Alan Cox) +o menu cleanups (me) + + + + 2.2.27-pre2 ----------- o A more correct fix to last mremap (2) bug (Dan Yefimov/Solar Designer) diff --git a/Makefile b/Makefile index e4d0b7bf3dd6..c70ccd72e782 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 2 SUBLEVEL = 27 -EXTRAVERSION = -pre2 +EXTRAVERSION = -rc1 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) diff --git a/arch/alpha/config.in b/arch/alpha/config.in index 4e04a974edbd..0869a1e8cec0 100644 --- a/arch/alpha/config.in +++ b/arch/alpha/config.in @@ -202,21 +202,26 @@ bool 'Networking support' CONFIG_NET bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL -tristate 'Kernel support for a.out (ECOFF) binaries' CONFIG_BINFMT_AOUT + +mainmenu_option next_comment +comment 'Executable file formats' tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_BINFMT_ELF" != "n" ]; then - bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT + bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT fi +tristate 'Kernel support for a.out (ECOFF) binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA fi tristate 'Kernel support for Linux/Intel ELF binaries' CONFIG_BINFMT_EM86 +endmenu + tristate 'Parallel port support' CONFIG_PARPORT if [ "$CONFIG_PARPORT" != "n" ]; then dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT if [ "$CONFIG_PARPORT_PC" != "n" ]; then - bool ' Support foreign hardware' CONFIG_PARPORT_OTHER + bool ' Support foreign hardware' CONFIG_PARPORT_OTHER fi fi endmenu @@ -229,15 +234,7 @@ if [ "$CONFIG_NET" = "y" ]; then source net/Config.in fi -mainmenu_option next_comment -comment 'SCSI support' - -tristate 'SCSI support' CONFIG_SCSI - -if [ "$CONFIG_SCSI" != "n" ]; then - source drivers/scsi/Config.in -fi -endmenu +source drivers/scsi/Config.in if [ "$CONFIG_NET" = "y" ]; then mainmenu_option next_comment @@ -273,7 +270,6 @@ fi endmenu source drivers/char/Config.in -source drivers/usb/Config.in source fs/Config.in if [ "$CONFIG_VT" = "y" ]; then @@ -288,14 +284,9 @@ if [ "$CONFIG_VT" = "y" ]; then endmenu fi -mainmenu_option next_comment -comment 'Sound' +source drivers/sound/Config.in -tristate 'Sound card support' CONFIG_SOUND -if [ "$CONFIG_SOUND" != "n" ]; then - source drivers/sound/Config.in -fi -endmenu +source drivers/usb/Config.in mainmenu_option next_comment comment 'Kernel hacking' diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig index c857d368322a..9616a9082222 100644 --- a/arch/alpha/defconfig +++ b/arch/alpha/defconfig @@ -51,9 +51,9 @@ CONFIG_NET=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y -# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_ELF_AOUT is not set +# CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set CONFIG_BINFMT_EM86=y # CONFIG_PARPORT is not set diff --git a/arch/arm/config.in b/arch/arm/config.in index eccfe45eb60a..c6168cfad3bb 100644 --- a/arch/arm/config.in +++ b/arch/arm/config.in @@ -11,6 +11,15 @@ comment 'Code maturity level options' bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL endmenu +mainmenu_option next_comment +comment 'Loadable module support' +bool 'Enable loadable module support' CONFIG_MODULES +if [ "$CONFIG_MODULES" = "y" ]; then + bool ' Set version information on all symbols for modules' CONFIG_MODVERSIONS + bool ' Kernel module loader' CONFIG_KMOD +fi +endmenu + mainmenu_option next_comment comment 'System and processor type' @@ -118,15 +127,6 @@ fi #bool 'Split text into discardable sections' CONFIG_TEXT_SECTIONS endmenu -mainmenu_option next_comment -comment 'Loadable module support' -bool 'Enable loadable module support' CONFIG_MODULES -if [ "$CONFIG_MODULES" = "y" ]; then - bool ' Set version information on all symbols for modules' CONFIG_MODVERSIONS - bool ' Kernel module loader' CONFIG_KMOD -fi -endmenu - mainmenu_option next_comment comment 'General setup' bool 'Networking support' CONFIG_NET @@ -134,15 +134,19 @@ bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL tristate 'Math emulation' CONFIG_NWFPE -tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + +mainmenu_option next_comment +comment 'Executable file formats' tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_BINFMT_ELF" != "n" ]; then - bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT + bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT fi +tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC if [ "$CONFIG_CPU_32" = "y" ]; then tristate 'RISC OS personality' CONFIG_ARTHUR fi +endmenu tristate 'Parallel port support' CONFIG_PARPORT if [ "$CONFIG_PARPORT" != "n" ]; then @@ -154,7 +158,7 @@ if [ "$CONFIG_PARPORT" != "n" ]; then # support for loading any others. Defeat this if the user is keen. if [ "$CONFIG_PARPORT_PC" = "n" -o "$CONFIG_PARPORT_ARC" = "n" ]; then if [ "$CONFIG_PARPORT_PC" != "n" -o "$CONFIG_PARPORT_ARC" != "n" ]; then - bool ' Support foreign hardware' CONFIG_PARPORT_OTHER + bool ' Support foreign hardware' CONFIG_PARPORT_OTHER fi fi fi @@ -235,25 +239,10 @@ fi # fi # endmenu -mainmenu_option next_comment -comment 'SCSI support' - -tristate 'SCSI support?' CONFIG_SCSI - -if [ "$CONFIG_SCSI" != "n" ]; then - source drivers/scsi/Config.in -fi -endmenu +source drivers/scsi/Config.in if [ "$CONFIG_ARCH_ACORN" = "y" -o "$CONFIG_PCI" = "y" ]; then - mainmenu_option next_comment - comment 'Sound' - - tristate 'Sound support' CONFIG_SOUND - if [ "$CONFIG_SOUND" != "n" ]; then - source drivers/sound/Config.in - fi - endmenu + source drivers/sound/Config.in fi source fs/Config.in diff --git a/arch/arm/defconfig b/arch/arm/defconfig index 4825a6cf027f..1491242a6421 100644 --- a/arch/arm/defconfig +++ b/arch/arm/defconfig @@ -49,9 +49,9 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y CONFIG_NWFPE=y -# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_ELF_AOUT is not set +# CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set # CONFIG_ARTHUR is not set CONFIG_PARPORT=y diff --git a/arch/i386/config.in b/arch/i386/config.in index 3425083482c6..aa3314d326e7 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -11,6 +11,15 @@ comment 'Code maturity level options' bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL endmenu +mainmenu_option next_comment +comment 'Loadable module support' +bool 'Enable loadable module support' CONFIG_MODULES +if [ "$CONFIG_MODULES" = "y" ]; then + bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS + bool 'Kernel module loader' CONFIG_KMOD +fi +endmenu + mainmenu_option next_comment comment 'Processor type and features' choice 'Processor family' \ @@ -39,27 +48,18 @@ tristate '/dev/cpu/microcode - Intel IA32 CPU microcode support' CONFIG_MICROCOD tristate '/dev/cpu/*/msr - Model-specific register support' CONFIG_X86_MSR tristate '/dev/cpu/*/cpuid - CPU information support' CONFIG_X86_CPUID -choice 'Maximum Physical Memory' \ - "1GB CONFIG_1GB \ - 2GB CONFIG_2GB" 1GB - bool 'Math emulation' CONFIG_MATH_EMULATION bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR bool 'Symmetric multi-processing support' CONFIG_SMP endmenu -mainmenu_option next_comment -comment 'Loadable module support' -bool 'Enable loadable module support' CONFIG_MODULES -if [ "$CONFIG_MODULES" = "y" ]; then - bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS - bool 'Kernel module loader' CONFIG_KMOD -fi -endmenu - mainmenu_option next_comment comment 'General setup' +choice 'Maximum Physical Memory' \ + "1GB CONFIG_1GB \ + 2GB CONFIG_2GB" 1GB + bool 'Networking support' CONFIG_NET bool 'PCI support' CONFIG_PCI if [ "$CONFIG_PCI" = "y" ]; then @@ -94,24 +94,22 @@ fi bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL -tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + +mainmenu_option next_comment +comment 'Executable file formats' tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_BINFMT_ELF" != "n" ]; then - bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT + bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT fi +tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA fi +endmenu -tristate 'Parallel port support' CONFIG_PARPORT -if [ "$CONFIG_PARPORT" != "n" ]; then - dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT - if [ "$CONFIG_PARPORT_PC" != "n" ]; then - bool ' Support foreign hardware' CONFIG_PARPORT_OTHER - fi -fi - +mainmenu_option next_comment +comment 'Power Management support' bool 'Advanced Power Management BIOS support' CONFIG_APM if [ "$CONFIG_APM" != "n" ]; then bool ' Ignore USER SUSPEND' CONFIG_APM_IGNORE_USER_SUSPEND @@ -122,10 +120,23 @@ if [ "$CONFIG_APM" != "n" ]; then bool ' Allow interrupts during APM BIOS calls' CONFIG_APM_ALLOW_INTS bool ' Use real mode APM BIOS call to power off' CONFIG_APM_REAL_MODE_POWER_OFF fi +endmenu + tristate 'Toshiba Laptop support' CONFIG_TOSHIBA endmenu +mainmenu_option next_comment +comment 'Parallel port support' +tristate 'Parallel port support' CONFIG_PARPORT +if [ "$CONFIG_PARPORT" != "n" ]; then + dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT + if [ "$CONFIG_PARPORT_PC" != "n" ]; then + bool ' Support foreign hardware' CONFIG_PARPORT_OTHER + fi +fi +endmenu + source drivers/pnp/Config.in source drivers/block/Config.in @@ -147,15 +158,8 @@ fi source drivers/telephony/Config.in -mainmenu_option next_comment -comment 'SCSI support' - -tristate 'SCSI support' CONFIG_SCSI +source drivers/scsi/Config.in -if [ "$CONFIG_SCSI" != "n" ]; then - source drivers/scsi/Config.in -fi -endmenu source drivers/i2o/Config.in @@ -184,8 +188,6 @@ endmenu source drivers/char/Config.in -source drivers/usb/Config.in - source fs/Config.in if [ "$CONFIG_VT" = "y" ]; then @@ -201,14 +203,9 @@ if [ "$CONFIG_VT" = "y" ]; then endmenu fi -mainmenu_option next_comment -comment 'Sound' +source drivers/sound/Config.in -tristate 'Sound card support' CONFIG_SOUND -if [ "$CONFIG_SOUND" != "n" ]; then - source drivers/sound/Config.in -fi -endmenu +source drivers/usb/Config.in mainmenu_option next_comment comment 'Kernel hacking' diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 43c4c0a19edf..7aab65b4d1ff 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -56,9 +56,9 @@ CONFIG_X86_LOCAL_APIC=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y -# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_ELF_AOUT is not set +# CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set # CONFIG_PARPORT is not set # CONFIG_APM is not set diff --git a/arch/m68k/config.in b/arch/m68k/config.in index fb50fbff0e8d..49751e543317 100644 --- a/arch/m68k/config.in +++ b/arch/m68k/config.in @@ -82,12 +82,16 @@ bool 'Networking support' CONFIG_NET bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL -tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + +mainmenu_option next_comment +comment 'Executable file formats' tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_BINFMT_ELF" != "n" ]; then - bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT + bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT fi +tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC +endmenu if [ "$CONFIG_AMIGA" = "y" ]; then bool 'Amiga Zorro (AutoConfig) bus support' CONFIG_ZORRO @@ -442,6 +446,8 @@ fi endmenu +source fs/Config.in + mainmenu_option next_comment comment 'Sound support' @@ -451,8 +457,6 @@ if [ "$CONFIG_SOUND" != "n" ]; then fi endmenu -source fs/Config.in - if [ "$CONFIG_VME" = "n" ]; then mainmenu_option next_comment comment 'Console drivers' diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig index 0b84658cfa39..89fcc87ce305 100644 --- a/arch/m68k/defconfig +++ b/arch/m68k/defconfig @@ -38,9 +38,9 @@ CONFIG_M68040=y CONFIG_NET=y CONFIG_SYSVIPC=y CONFIG_SYSCTL=y -# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_ELF_AOUT is not set +# CONFIG_BINFMT_AOUT is not set CONFIG_ZORRO=y # CONFIG_AMIGA_GSP is not set # CONFIG_GSP_RESOLVER is not set diff --git a/arch/mips/config.in b/arch/mips/config.in index 1bafe5be1e5b..cad7cd8eefd6 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -9,6 +9,15 @@ comment 'Code maturity level options' bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL endmenu +mainmenu_option next_comment +comment 'Loadable module support' +bool 'Enable loadable module support' CONFIG_MODULES +if [ "$CONFIG_MODULES" = "y" ]; then + bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS + bool 'Kernel module loader' CONFIG_KMOD +fi +endmenu + mainmenu_option next_comment comment 'Machine selection' bool 'Support for Acer PICA 1 chipset' CONFIG_ACER_PICA_61 @@ -77,19 +86,25 @@ else bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN fi -define_bool CONFIG_ELF_KERNEL y if [ "$CONFIG_CPU_LITTLE_ENDIAN" = "n" ]; then define_bool CONFIG_BINFMT_IRIX y define_bool CONFIG_FORWARD_KEYBOARD y fi -define_bool CONFIG_BINFMT_AOUT n -define_bool CONFIG_BINFMT_ELF y -bool 'ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT + +mainmenu_option next_comment +comment 'Executable file formats' +define_bool CONFIG_ELF_KERNEL y +tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF +if [ "$CONFIG_BINFMT_ELF" != "n" ]; then + bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT +fi +tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA fi +endmenu bool 'Networking support' CONFIG_NET bool 'System V IPC' CONFIG_SYSVIPC @@ -101,20 +116,10 @@ if [ "$CONFIG_SGI" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" fi endmenu -mainmenu_option next_comment -comment 'Loadable module support' -bool 'Enable loadable module support' CONFIG_MODULES -if [ "$CONFIG_MODULES" = "y" ]; then - bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS - bool 'Kernel module loader' CONFIG_KMOD -fi - if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool 'Support for frame buffer devices (EXPERIMENTAL)' CONFIG_FB fi -endmenu - if [ "$CONFIG_DECSTATION" = "y" ]; then mainmenu_option next_comment comment 'TURBOchannel support' @@ -258,10 +263,10 @@ else endmenu fi -# source drivers/usb/Config.in - source fs/Config.in +# source drivers/usb/Config.in + if [ "$CONFIG_VT" = "y" ]; then mainmenu_option next_comment comment 'Console drivers' @@ -281,14 +286,7 @@ if [ "$CONFIG_VT" = "y" ]; then fi if [ "$CONFIG_DECSTATION" != "y" ]; then - mainmenu_option next_comment - comment 'Sound' - - tristate 'Sound card support' CONFIG_SOUND - if [ "$CONFIG_SOUND" != "n" ]; then source drivers/sound/Config.in - fi - endmenu fi if [ "$CONFIG_SGI" = "y" ]; then diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 61d7474f99e9..581c4b7aeef0 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -36,9 +36,9 @@ CONFIG_PCI_QUIRKS=y CONFIG_PCI_OLD_PROC=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_ELF_KERNEL=y -# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_ELF_AOUT is not set +# CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set CONFIG_NET=y CONFIG_SYSVIPC=y diff --git a/arch/ppc/config.in b/arch/ppc/config.in index 3cc2d3dd9a7c..e8f4c2c32139 100644 --- a/arch/ppc/config.in +++ b/arch/ppc/config.in @@ -67,17 +67,22 @@ bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT # only elf supported, a.out is not -- Cort -define_bool CONFIG_BINFMT_ELF y +mainmenu_option next_comment +comment 'Executable file formats' define_bool CONFIG_KERNEL_ELF y -bool 'ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT +tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF +if [ "$CONFIG_BINFMT_ELF" != "n" ]; then + bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT +fi tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA +endmenu tristate 'Parallel port support' CONFIG_PARPORT if [ "$CONFIG_PARPORT" != "n" ]; then - dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT + dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT if [ "$CONFIG_PARPORT_PC" != "n" ]; then - bool ' Support foreign hardware' CONFIG_PARPORT_OTHER + bool ' Support foreign hardware' CONFIG_PARPORT_OTHER fi fi @@ -126,13 +131,7 @@ if [ "$CONFIG_NET" = "y" ]; then source net/Config.in fi -mainmenu_option next_comment -comment 'SCSI support' -tristate 'SCSI support' CONFIG_SCSI -if [ "$CONFIG_SCSI" != "n" ]; then - source drivers/scsi/Config.in -fi -endmenu +source drivers/scsi/Config.in if [ "$CONFIG_NET" = "y" ]; then mainmenu_option next_comment @@ -175,6 +174,9 @@ source drivers/video/Config.in endmenu source drivers/char/Config.in + +source fs/Config.in + source drivers/usb/Config.in mainmenu_option next_comment @@ -209,8 +211,6 @@ fi endmenu -source fs/Config.in - mainmenu_option next_comment comment 'Kernel hacking' diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig index f4c94aecf4c3..53a1e0e425bf 100644 --- a/arch/ppc/defconfig +++ b/arch/ppc/defconfig @@ -33,9 +33,9 @@ CONFIG_NET=y CONFIG_SYSCTL=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_KERNEL_ELF=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_ELF_AOUT is not set -CONFIG_KERNEL_ELF=y # CONFIG_BINFMT_MISC is not set # CONFIG_BINFMT_JAVA is not set CONFIG_PARPORT=m diff --git a/arch/s390/config.in b/arch/s390/config.in index c2154bfe685c..0582288b0d13 100644 --- a/arch/s390/config.in +++ b/arch/s390/config.in @@ -11,12 +11,6 @@ bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG endmenu -mainmenu_option next_comment -comment 'Processor type and features' -bool 'Symmetric multi-processing support' CONFIG_SMP -bool 'IEEE FPU emulation' CONFIG_IEEEFPU_EMULATION -endmenu - mainmenu_option next_comment comment 'Loadable module support' bool 'Enable loadable module support' CONFIG_MODULES @@ -26,6 +20,12 @@ if [ "$CONFIG_MODULES" = "y" ]; then fi endmenu +mainmenu_option next_comment +comment 'Processor type and features' +bool 'Symmetric multi-processing support' CONFIG_SMP +bool 'IEEE FPU emulation' CONFIG_IEEEFPU_EMULATION +endmenu + mainmenu_option next_comment comment 'General setup' bool 'Fast IRQ handling' CONFIG_FAST_IRQ @@ -39,10 +39,14 @@ bool 'Networking support' CONFIG_NET bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL + +mainmenu_option next_comment +comment 'Executable file formats' tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_BINFMT_ELF" != "n" ]; then bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT fi +endmenu endmenu diff --git a/arch/sparc/config.in b/arch/sparc/config.in index a82a83ea57a7..531aa07063f1 100644 --- a/arch/sparc/config.in +++ b/arch/sparc/config.in @@ -72,17 +72,21 @@ bool 'Networking support' CONFIG_NET bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL -tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + +mainmenu_option next_comment +comment 'Executable file formats' tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_BINFMT_ELF" != "n" ]; then - bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT + bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT fi +tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA fi bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL endmenu +endmenu mainmenu_option next_comment comment 'Floppy, IDE, and other block devices' diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig index 04117cf62c5a..8c52c6a3cd36 100644 --- a/arch/sparc/defconfig +++ b/arch/sparc/defconfig @@ -78,9 +78,9 @@ CONFIG_NET=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y -# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_ELF_AOUT is not set +# CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set CONFIG_BINFMT_JAVA=m CONFIG_SUNOS_EMUL=y diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in index ff3c223afe6e..de4d66fa9cbe 100644 --- a/arch/sparc64/config.in +++ b/arch/sparc64/config.in @@ -60,14 +60,18 @@ bool 'Networking support' CONFIG_NET bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL -bool 'Kernel support for Linux/Sparc 32bit binary compatibility' CONFIG_SPARC32_COMPAT + +mainmenu_option next_comment +comment 'Executable file formats' + tristate 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_BINFMT_ELF" != "n" ]; then - bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT + bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT fi +bool 'Kernel support for Linux/Sparc 32bit binary compatibility' CONFIG_SPARC32_COMPAT if [ "$CONFIG_SPARC32_COMPAT" != "n" ]; then - tristate 'Kernel support for 32-bit ELF binaries' CONFIG_BINFMT_ELF32 - bool 'Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32 + tristate ' Kernel support for 32-bit ELF binaries' CONFIG_BINFMT_ELF32 + bool ' Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32 fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC @@ -77,6 +81,7 @@ bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Solaris binary emulation' CONFIG_SOLARIS_EMUL fi +endmenu if [ "$CONFIG_PCI" = "y" ]; then tristate 'Parallel port support' CONFIG_PARPORT diff --git a/drivers/acorn/scsi/Config.in b/drivers/acorn/scsi/Config.in index 68d4f920bf51..0887e31312f6 100644 --- a/drivers/acorn/scsi/Config.in +++ b/drivers/acorn/scsi/Config.in @@ -1,23 +1,23 @@ # # SCSI driver configuration for Acorn # -dep_tristate 'Acorn SCSI card (aka30) support' CONFIG_SCSI_ACORNSCSI_3 $CONFIG_SCSI +dep_tristate ' Acorn SCSI card (aka30) support' CONFIG_SCSI_ACORNSCSI_3 $CONFIG_SCSI if [ "$CONFIG_SCSI_ACORNSCSI_3" != "n" ]; then - bool ' Support SCSI 2 Tagged queueing' CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE - bool ' Support SCSI 2 Synchronous Transfers' CONFIG_SCSI_ACORNSCSI_SYNC + bool ' Support SCSI 2 Tagged queueing' CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE + bool ' Support SCSI 2 Synchronous Transfers' CONFIG_SCSI_ACORNSCSI_SYNC fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate 'ARXE SCSI support (Experimental)' CONFIG_SCSI_ARXESCSI $CONFIG_SCSI - dep_tristate 'CumanaSCSI II support (Experimental)' CONFIG_SCSI_CUMANA_2 $CONFIG_SCSI - dep_tristate 'EESOX support (Experimental)' CONFIG_SCSI_EESOXSCSI $CONFIG_SCSI - dep_tristate 'PowerTec support (Experimental)' CONFIG_SCSI_POWERTECSCSI $CONFIG_SCSI + dep_tristate ' ARXE SCSI support (Experimental)' CONFIG_SCSI_ARXESCSI $CONFIG_SCSI + dep_tristate ' CumanaSCSI II support (Experimental)' CONFIG_SCSI_CUMANA_2 $CONFIG_SCSI + dep_tristate ' EESOX support (Experimental)' CONFIG_SCSI_EESOXSCSI $CONFIG_SCSI + dep_tristate ' PowerTec support (Experimental)' CONFIG_SCSI_POWERTECSCSI $CONFIG_SCSI - comment 'The following drivers are not fully supported' + comment ' The following drivers are not fully supported' - dep_tristate 'CumanaSCSI I support' CONFIG_SCSI_CUMANA_1 $CONFIG_SCSI + dep_tristate ' CumanaSCSI I support' CONFIG_SCSI_CUMANA_1 $CONFIG_SCSI if [ "$CONFIG_ARCH_ARC" = "y" -o "$CONFIG_ARCH_A5K" = "y" ]; then - dep_tristate 'EcoScsi support' CONFIG_SCSI_ECOSCSI $CONFIG_SCSI + dep_tristate ' EcoScsi support' CONFIG_SCSI_ECOSCSI $CONFIG_SCSI fi - dep_tristate 'Oak SCSI support' CONFIG_SCSI_OAK1 $CONFIG_SCSI + dep_tristate ' Oak SCSI support' CONFIG_SCSI_OAK1 $CONFIG_SCSI fi diff --git a/drivers/cdrom/Config.in b/drivers/cdrom/Config.in index 3ecee30b2c5e..3c95e51d3b20 100644 --- a/drivers/cdrom/Config.in +++ b/drivers/cdrom/Config.in @@ -1,27 +1,27 @@ # # CDROM driver configuration # -tristate 'Aztech/Orchid/Okano/Wearnes/TXC/CyDROM CDROM support' CONFIG_AZTCD -tristate 'Goldstar R420 CDROM support' CONFIG_GSCD -tristate 'Matsushita/Panasonic/Creative, Longshine, TEAC CDROM support' CONFIG_SBPCD +tristate ' Aztech/Orchid/Okano/Wearnes/TXC/CyDROM CDROM support' CONFIG_AZTCD +tristate ' Goldstar R420 CDROM support' CONFIG_GSCD +tristate ' Matsushita/Panasonic/Creative, Longshine, TEAC CDROM support' CONFIG_SBPCD if [ "$CONFIG_SBPCD" = "y" ]; then - bool 'Matsushita/Panasonic, ... second CDROM controller support' CONFIG_SBPCD2 + bool ' Matsushita/Panasonic, ... second CDROM controller support' CONFIG_SBPCD2 if [ "$CONFIG_SBPCD2" = "y" ]; then - bool 'Matsushita/Panasonic, ... third CDROM controller support' CONFIG_SBPCD3 + bool ' Matsushita/Panasonic, ... third CDROM controller support' CONFIG_SBPCD3 if [ "$CONFIG_SBPCD3" = "y" ]; then - bool 'Matsushita/Panasonic, ... fourth CDROM controller support' CONFIG_SBPCD4 + bool ' Matsushita/Panasonic, ... fourth CDROM controller support' CONFIG_SBPCD4 fi fi fi -tristate 'Mitsumi (standard) [no XA/Multisession] CDROM support' CONFIG_MCD +tristate ' Mitsumi (standard) [no XA/Multisession] CDROM support' CONFIG_MCD if [ "$CONFIG_MCD" != "n" ]; then int 'MCD IRQ' CONFIG_MCD_IRQ 11 hex 'MCD I/O base' CONFIG_MCD_BASE 300 fi -tristate 'Mitsumi [XA/MultiSession] CDROM support' CONFIG_MCDX -tristate 'Optics Storage DOLPHIN 8000AT CDROM support' CONFIG_OPTCD -tristate 'Philips/LMS CM206 CDROM support' CONFIG_CM206 -tristate 'Sanyo CDR-H94A CDROM support' CONFIG_SJCD -tristate 'ISP16/MAD16/Mozart soft configurable cdrom interface support' CONFIG_ISP16_CDI -tristate 'Sony CDU31A/CDU33A CDROM support' CONFIG_CDU31A -tristate 'Sony CDU535 CDROM support' CONFIG_CDU535 +tristate ' Mitsumi [XA/MultiSession] CDROM support' CONFIG_MCDX +tristate ' Optics Storage DOLPHIN 8000AT CDROM support' CONFIG_OPTCD +tristate ' Philips/LMS CM206 CDROM support' CONFIG_CM206 +tristate ' Sanyo CDR-H94A CDROM support' CONFIG_SJCD +tristate ' ISP16/MAD16/Mozart soft configurable cdrom interface support' CONFIG_ISP16_CDI +tristate ' Sony CDU31A/CDU33A CDROM support' CONFIG_CDU31A +tristate ' Sony CDU535 CDROM support' CONFIG_CDU535 diff --git a/drivers/char/Config.in b/drivers/char/Config.in index cfbf6ad4501a..e2f93cb55c7e 100644 --- a/drivers/char/Config.in +++ b/drivers/char/Config.in @@ -12,50 +12,58 @@ tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL if [ "$CONFIG_SERIAL" = "y" ]; then bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE fi + +mainmenu_option next_comment +comment 'Extended dumb serial driver options' bool 'Extended dumb serial driver options' CONFIG_SERIAL_EXTENDED if [ "$CONFIG_SERIAL_EXTENDED" = "y" ]; then - bool ' Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS - bool ' Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ - bool ' Autodetect IRQ on standard ports (unsafe)' CONFIG_SERIAL_DETECT_IRQ - bool ' Support special multiport boards' CONFIG_SERIAL_MULTIPORT - bool ' Support the Bell Technologies HUB6 card' CONFIG_HUB6 + bool ' Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS + bool ' Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ + bool ' Autodetect IRQ on standard ports (unsafe)' CONFIG_SERIAL_DETECT_IRQ + bool ' Support special multiport boards' CONFIG_SERIAL_MULTIPORT + bool ' Support the Bell Technologies HUB6 card' CONFIG_HUB6 fi +endmenu + +mainmenu_option next_comment +comment 'Non-standard serial port support' bool 'Non-standard serial port support' CONFIG_SERIAL_NONSTANDARD if [ "$CONFIG_SERIAL_NONSTANDARD" = "y" ]; then - tristate 'Computone IntelliPort Plus serial support' CONFIG_COMPUTONE - tristate 'Comtrol Rocketport support' CONFIG_ROCKETPORT - tristate 'Cyclades async mux support' CONFIG_CYCLADES + tristate ' Computone IntelliPort Plus serial support' CONFIG_COMPUTONE + tristate ' Comtrol Rocketport support' CONFIG_ROCKETPORT + tristate ' Cyclades async mux support' CONFIG_CYCLADES if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_CYCLADES" != "n" ]; then - bool ' Cyclades-Z interrupt mode operation (EXPERIMENTAL)' CONFIG_CYZ_INTR + bool ' Cyclades-Z interrupt mode operation (EXPERIMENTAL)' CONFIG_CYZ_INTR fi - tristate 'Digiboard Intelligent Async Support' CONFIG_DIGIEPCA + tristate ' Digiboard Intelligent Async Support' CONFIG_DIGIEPCA if [ "$CONFIG_DIGIEPCA" = "n" ]; then - tristate 'Digiboard PC/Xx Support' CONFIG_DIGI + tristate ' Digiboard PC/Xx Support' CONFIG_DIGI fi - tristate 'Hayes ESP serial port support' CONFIG_ESPSERIAL - tristate 'Moxa Intellio support' CONFIG_MOXA_INTELLIO - tristate 'Moxa SmartIO support' CONFIG_MOXA_SMARTIO + tristate ' Hayes ESP serial port support' CONFIG_ESPSERIAL + tristate ' Moxa Intellio support' CONFIG_MOXA_INTELLIO + tristate ' Moxa SmartIO support' CONFIG_MOXA_SMARTIO if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate 'Multi-Tech multiport card support' CONFIG_ISI m + dep_tristate ' Multi-Tech multiport card support' CONFIG_ISI m fi - tristate 'SDL RISCom/8 card support' CONFIG_RISCOM8 - tristate 'Specialix IO8+ card support' CONFIG_SPECIALIX + tristate ' SDL RISCom/8 card support' CONFIG_RISCOM8 + tristate ' Specialix IO8+ card support' CONFIG_SPECIALIX if [ "$CONFIG_SPECIALIX" != "n" ]; then - bool 'Specialix DTR/RTS pin is RTS' CONFIG_SPECIALIX_RTSCTS + bool ' Specialix DTR/RTS pin is RTS' CONFIG_SPECIALIX_RTSCTS fi - tristate 'Specialix SX (and SI) card support' CONFIG_SX - tristate 'Specialix RIO system support' CONFIG_RIO + tristate ' Specialix SX (and SI) card support' CONFIG_SX + tristate ' Specialix RIO system support' CONFIG_RIO if [ "$CONFIG_RIO" != "n" ]; then - bool 'Support really old RIO/PCI cards' CONFIG_RIO_OLDPCI + bool ' Support really old RIO/PCI cards' CONFIG_RIO_OLDPCI fi - bool 'Stallion multiport serial support' CONFIG_STALDRV + bool ' Stallion multiport serial support' CONFIG_STALDRV if [ "$CONFIG_STALDRV" = "y" ]; then - tristate ' Stallion EasyIO or EC8/32 support' CONFIG_STALLION - tristate ' Stallion EC8/64, ONboard, Brumby support' CONFIG_ISTALLION + tristate ' Stallion EasyIO or EC8/32 support' CONFIG_STALLION + tristate ' Stallion EC8/64, ONboard, Brumby support' CONFIG_ISTALLION fi - tristate 'Microgate SyncLink card support' CONFIG_SYNCLINK - tristate 'HDLC line discipline support' CONFIG_N_HDLC + tristate ' Microgate SyncLink card support' CONFIG_SYNCLINK + tristate ' HDLC line discipline support' CONFIG_N_HDLC fi +endmenu bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256 @@ -66,19 +74,19 @@ if [ "$CONFIG_PARPORT" = "y" -o "$CONFIG_PARPORT" = "m" ]; then bool ' Support IEEE1284 status readback' CONFIG_PRINTER_READBACK fi fi - + +mainmenu_option next_comment +comment 'Mice' bool 'Mouse Support (not serial mice)' CONFIG_MOUSE if [ "$CONFIG_MOUSE" = "y" ]; then - mainmenu_option next_comment - comment 'Mice' - tristate 'ATIXL busmouse support' CONFIG_ATIXL_BUSMOUSE - tristate 'Logitech busmouse support' CONFIG_BUSMOUSE - tristate 'Microsoft busmouse support' CONFIG_MS_BUSMOUSE - bool 'PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE - tristate 'C&T 82C710 mouse port support (as on TI Travelmate)' CONFIG_82C710_MOUSE - tristate 'PC110 digitizer pad support' CONFIG_PC110_PAD - endmenu + tristate ' ATIXL busmouse support' CONFIG_ATIXL_BUSMOUSE + tristate ' Logitech busmouse support' CONFIG_BUSMOUSE + tristate ' Microsoft busmouse support' CONFIG_MS_BUSMOUSE + bool ' PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE + tristate ' C&T 82C710 mouse port support (as on TI Travelmate)' CONFIG_82C710_MOUSE + tristate ' PC110 digitizer pad support' CONFIG_PC110_PAD fi +endmenu source drivers/char/joystick/Config.in @@ -94,29 +102,29 @@ if [ "$CONFIG_QIC02_TAPE" != "n" ]; then fi fi +mainmenu_option next_comment +comment 'Watchdog Cards' bool 'Watchdog Timer Support' CONFIG_WATCHDOG if [ "$CONFIG_WATCHDOG" != "n" ]; then - mainmenu_option next_comment - comment 'Watchdog Cards' - bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT - tristate ' Acquire SBC Watchdog Timer' CONFIG_ACQUIRE_WDT - tristate ' Advantech SBC Watchdog Timer' CONFIG_ADVANTECH_WDT - tristate ' Berkshire Products PC Watchdog' CONFIG_PCWATCHDOG - tristate ' Intel i810 TCO timer / Watchdog' CONFIG_I810_TCO - tristate ' Mixcom Watchdog' CONFIG_MIXCOMWD - tristate ' SBC-60XX Watchdog Timer' CONFIG_60XX_WDT - tristate ' Software Watchdog' CONFIG_SOFT_WATCHDOG - tristate ' WDT ISA Watchdog timer' CONFIG_WDT + bool ' Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT + tristate ' Acquire SBC Watchdog Timer' CONFIG_ACQUIRE_WDT + tristate ' Advantech SBC Watchdog Timer' CONFIG_ADVANTECH_WDT + tristate ' Berkshire Products PC Watchdog' CONFIG_PCWATCHDOG + tristate ' Intel i810 TCO timer / Watchdog' CONFIG_I810_TCO + tristate ' Mixcom Watchdog' CONFIG_MIXCOMWD + tristate ' SBC-60XX Watchdog Timer' CONFIG_60XX_WDT + tristate ' Software Watchdog' CONFIG_SOFT_WATCHDOG + tristate ' WDT ISA Watchdog timer' CONFIG_WDT if [ "$CONFIG_WDT" != "n" ]; then - bool ' WDT501 features' CONFIG_WDT_501 + bool ' WDT501 features' CONFIG_WDT_501 if [ "$CONFIG_WDT_501" = "y" ]; then - bool ' Fan Tachometer' CONFIG_WDT_501_FAN + bool ' Fan Tachometer' CONFIG_WDT_501_FAN fi fi - tristate ' WDT PCI Watchdog timer' CONFIG_WDTPCI - tristate ' ZF MachZ Watchdog' CONFIG_MACHZ_WDT - endmenu + tristate ' WDT PCI Watchdog timer' CONFIG_WDTPCI + tristate ' ZF MachZ Watchdog' CONFIG_MACHZ_WDT fi +endmenu tristate '/dev/nvram support' CONFIG_NVRAM @@ -129,6 +137,8 @@ if [ "$CONFIG_PCI" = "y" ]; then fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + mainmenu_option next_comment + comment 'AGP support (/dev/agpgart)' tristate '/dev/agpgart (AGP Support) (EXPERIMENTAL)' CONFIG_AGP if [ "$CONFIG_AGP" != "n" ]; then bool ' Intel 440LX/BX/GX and I815/820 support' CONFIG_AGP_INTEL @@ -139,6 +149,7 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool ' ALI M1541 support' CONFIG_AGP_ALI bool ' Serverworks LE/HE support' CONFIG_AGP_SWORKS fi + endmenu source drivers/char/drm/Config.in fi @@ -147,80 +158,80 @@ comment 'Video For Linux' tristate 'Video For Linux' CONFIG_VIDEO_DEV if [ "$CONFIG_VIDEO_DEV" != "n" ]; then - dep_tristate 'AIMSlab RadioTrack (aka RadioReveal) support' CONFIG_RADIO_RTRACK $CONFIG_VIDEO_DEV + dep_tristate ' AIMSlab RadioTrack (aka RadioReveal) support' CONFIG_RADIO_RTRACK $CONFIG_VIDEO_DEV if [ "$CONFIG_RADIO_RTRACK" = "y" ]; then - hex ' RadioTrack i/o port (0x20f or 0x30f)' CONFIG_RADIO_RTRACK_PORT 20f + hex ' RadioTrack i/o port (0x20f or 0x30f)' CONFIG_RADIO_RTRACK_PORT 20f fi - dep_tristate 'AIMSlab RadioTrack II support' CONFIG_RADIO_RTRACK2 $CONFIG_VIDEO_DEV + dep_tristate ' AIMSlab RadioTrack II support' CONFIG_RADIO_RTRACK2 $CONFIG_VIDEO_DEV if [ "$CONFIG_RADIO_RTRACK2" = "y" ]; then - hex ' RadioTrack II i/o port (0x20c or 0x30c)' CONFIG_RADIO_RTRACK2_PORT 30c + hex ' RadioTrack II i/o port (0x20c or 0x30c)' CONFIG_RADIO_RTRACK2_PORT 30c fi - dep_tristate 'Aztech/Packard Bell Radio' CONFIG_RADIO_AZTECH $CONFIG_VIDEO_DEV + dep_tristate ' Aztech/Packard Bell Radio' CONFIG_RADIO_AZTECH $CONFIG_VIDEO_DEV if [ "$CONFIG_RADIO_AZTECH" = "y" ]; then - hex ' Aztech/Packard Bell I/O port (0x350 or 0x358)' CONFIG_RADIO_AZTECH_PORT 350 + hex ' Aztech/Packard Bell I/O port (0x350 or 0x358)' CONFIG_RADIO_AZTECH_PORT 350 fi - dep_tristate 'ADS Cadet AM/FM Tuner' CONFIG_RADIO_CADET $CONFIG_VIDEO_DEV - dep_tristate 'GemTek Radio Card support' CONFIG_RADIO_GEMTEK $CONFIG_VIDEO_DEV + dep_tristate ' ADS Cadet AM/FM Tuner' CONFIG_RADIO_CADET $CONFIG_VIDEO_DEV + dep_tristate ' GemTek Radio Card support' CONFIG_RADIO_GEMTEK $CONFIG_VIDEO_DEV if [ "$CONFIG_RADIO_GEMTEK" = "y" ]; then - hex ' GemTek i/o port (0x20c, 0x24c, 0x248, 0x30c, or 0x34c)' CONFIG_RADIO_GEMTEK_PORT 34c + hex ' GemTek i/o port (0x20c, 0x24c, 0x248, 0x30c, or 0x34c)' CONFIG_RADIO_GEMTEK_PORT 34c fi - dep_tristate 'Maestro on board radio' CONFIG_RADIO_MAESTRO $CONFIG_VIDEO_DEV - dep_tristate 'Miro PCM20 Radio' CONFIG_RADIO_MIROPCM20 $CONFIG_VIDEO_DEV - dep_tristate 'Trust FM Radio' CONFIG_RADIO_TRUST $CONFIG_VIDEO_DEV + dep_tristate ' Maestro on board radio' CONFIG_RADIO_MAESTRO $CONFIG_VIDEO_DEV + dep_tristate ' Miro PCM20 Radio' CONFIG_RADIO_MIROPCM20 $CONFIG_VIDEO_DEV + dep_tristate ' Trust FM Radio' CONFIG_RADIO_TRUST $CONFIG_VIDEO_DEV if [ "$CONFIG_RADIO_TRUST" = "y" ]; then - hex ' Trust FM Radio I/O port (0x350 or 0x358)' CONFIG_RADIO_TRUST_PORT 350 + hex ' Trust FM Radio I/O port (0x350 or 0x358)' CONFIG_RADIO_TRUST_PORT 350 fi if [ "$CONFIG_PCI" = "y" ]; then - dep_tristate 'BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV + dep_tristate ' BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV if [ "$CONFIG_VIDEO_BT848" != "n" ]; then - comment ' MSP3400 sound decoder support is in the section "additional' - comment ' low level sound drivers". You may need to enable it there.' + comment ' MSP3400 sound decoder support is in the section "additional' + comment ' low level sound drivers". You may need to enable it there.' fi fi if [ "$CONFIG_PARPORT" = "y" -o "$CONFIG_PARPORT" = "m" ]; then - dep_tristate 'Quickcam BW Video For Linux' CONFIG_VIDEO_BWQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT - dep_tristate 'Colour QuickCam Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT + dep_tristate ' Quickcam BW Video For Linux' CONFIG_VIDEO_BWQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT + dep_tristate ' Colour QuickCam Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate 'CPiA Video For Linux' CONFIG_VIDEO_CPIA $CONFIG_VIDEO_DEV + dep_tristate ' CPiA Video For Linux' CONFIG_VIDEO_CPIA $CONFIG_VIDEO_DEV if [ "$CONFIG_VIDEO_CPIA" != "n" ]; then - dep_tristate ' CPiA Parallel Port Lowlevel Support' CONFIG_VIDEO_CPIA_PP $CONFIG_VIDEO_CPIA $CONFIG_PARPORT + dep_tristate ' CPiA Parallel Port Lowlevel Support' CONFIG_VIDEO_CPIA_PP $CONFIG_VIDEO_CPIA $CONFIG_PARPORT if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then - dep_tristate ' CPiA USB Lowlevel Support' CONFIG_VIDEO_CPIA_USB $CONFIG_VIDEO_CPIA $CONFIG_USB + dep_tristate ' CPiA USB Lowlevel Support' CONFIG_VIDEO_CPIA_USB $CONFIG_VIDEO_CPIA $CONFIG_USB fi fi fi - dep_tristate 'Mediavision Pro Movie Studio Video For Linux' CONFIG_VIDEO_PMS $CONFIG_VIDEO_DEV + dep_tristate ' Mediavision Pro Movie Studio Video For Linux' CONFIG_VIDEO_PMS $CONFIG_VIDEO_DEV if [ "$CONFIG_POWERMAC" = "y" ]; then - dep_tristate 'PlanB Video-In on PowerMac' CONFIG_VIDEO_PLANB $CONFIG_VIDEO_DEV + dep_tristate ' PlanB Video-In on PowerMac' CONFIG_VIDEO_PLANB $CONFIG_VIDEO_DEV fi - dep_tristate 'SAA5249 Teletext processor' CONFIG_VIDEO_SAA5249 $CONFIG_VIDEO_DEV - dep_tristate 'SF16FMI Radio' CONFIG_RADIO_SF16FMI $CONFIG_VIDEO_DEV + dep_tristate ' SAA5249 Teletext processor' CONFIG_VIDEO_SAA5249 $CONFIG_VIDEO_DEV + dep_tristate ' SF16FMI Radio' CONFIG_RADIO_SF16FMI $CONFIG_VIDEO_DEV if [ "$CONFIG_RADIO_SF16FMI" = "y" ]; then - hex ' SF16FMI I/O port (0x284 or 0x384)' CONFIG_RADIO_SF16FMI_PORT 284 + hex ' SF16FMI I/O port (0x284 or 0x384)' CONFIG_RADIO_SF16FMI_PORT 284 fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_SGI" = "y" ]; then - dep_tristate 'SGI Vino Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_VINO $CONFIG_VIDEO_DEV + dep_tristate ' SGI Vino Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_VINO $CONFIG_VIDEO_DEV fi fi - dep_tristate 'Typhoon Radio (a.k.a. EcoRadio)' CONFIG_RADIO_TYPHOON $CONFIG_VIDEO_DEV + dep_tristate ' Typhoon Radio (a.k.a. EcoRadio)' CONFIG_RADIO_TYPHOON $CONFIG_VIDEO_DEV if [ "$CONFIG_PROC_FS" = "y" ]; then if [ "$CONFIG_RADIO_TYPHOON" != "n" ]; then - bool ' Support for /proc/radio-typhoon' CONFIG_RADIO_TYPHOON_PROC_FS + bool ' Support for /proc/radio-typhoon' CONFIG_RADIO_TYPHOON_PROC_FS fi fi if [ "$CONFIG_RADIO_TYPHOON" = "y" ]; then - hex ' Typhoon I/O port (0x316 or 0x336)' CONFIG_RADIO_TYPHOON_PORT 316 - int ' Typhoon frequency set when muting the device (kHz)' CONFIG_RADIO_TYPHOON_MUTEFREQ 87500 + hex ' Typhoon I/O port (0x316 or 0x336)' CONFIG_RADIO_TYPHOON_PORT 316 + int ' Typhoon frequency set when muting the device (kHz)' CONFIG_RADIO_TYPHOON_MUTEFREQ 87500 fi - dep_tristate 'Zoltrix Radio' CONFIG_RADIO_ZOLTRIX $CONFIG_VIDEO_DEV + dep_tristate ' Zoltrix Radio' CONFIG_RADIO_ZOLTRIX $CONFIG_VIDEO_DEV if [ "$CONFIG_RADIO_ZOLTRIX" = "y" ]; then - hex ' ZOLTRIX I/O port (0x20c or 0x30c)' CONFIG_RADIO_ZOLTRIX_PORT 20c + hex ' ZOLTRIX I/O port (0x20c or 0x30c)' CONFIG_RADIO_ZOLTRIX_PORT 20c fi - dep_tristate 'Zoran ZR36057/36060 support' CONFIG_VIDEO_ZORAN $CONFIG_VIDEO_DEV - dep_tristate ' Include support for Iomega Buz' CONFIG_VIDEO_BUZ $CONFIG_VIDEO_ZORAN - #dep_tristate ' Include support for LML33' CONFIG_VIDEO_LML33 $CONFIG_VIDEO_ZORAN + dep_tristate ' Zoran ZR36057/36060 support' CONFIG_VIDEO_ZORAN $CONFIG_VIDEO_DEV + dep_tristate ' Include support for Iomega Buz' CONFIG_VIDEO_BUZ $CONFIG_VIDEO_ZORAN + #dep_tristate ' Include support for LML33' CONFIG_VIDEO_LML33 $CONFIG_VIDEO_ZORAN fi endmenu diff --git a/drivers/char/console.c b/drivers/char/console.c index e2a9c7737b64..2676f2a80e8f 100644 --- a/drivers/char/console.c +++ b/drivers/char/console.c @@ -662,6 +662,9 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ return 0; } +#define VC_RESIZE_MAXCOL (32767) +#define VC_RESIZE_MAXROW (32767) + /* * Change # of rows and columns (0 means unchanged/the size of fg_console) * [this is to be used together with some user program @@ -674,6 +677,9 @@ int vc_resize(unsigned int lines, unsigned int cols, unsigned int currcons = fg_console, i; unsigned short *newscreens[MAX_NR_CONSOLES]; + if (cols > VC_RESIZE_MAXCOL || lines > VC_RESIZE_MAXROW) + return -EINVAL; + cc = (cols ? cols : video_num_columns); ll = (lines ? lines : video_num_lines); sr = cc << 1; diff --git a/drivers/char/drm/Config.in b/drivers/char/drm/Config.in index d24d6597004d..cf01270797b0 100644 --- a/drivers/char/drm/Config.in +++ b/drivers/char/drm/Config.in @@ -5,6 +5,8 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.x. # +mainmenu_option next_comment +comment 'Direct Rendering Manager (XFree86 DRI support)' tristate 'Direct Rendering Manager (XFree86 DRI support)' CONFIG_DRM if [ "$CONFIG_DRM" != "n" ]; then tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX @@ -13,3 +15,4 @@ if [ "$CONFIG_DRM" != "n" ]; then dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP fi +endmenu diff --git a/drivers/char/ftape/Config.in b/drivers/char/ftape/Config.in index 2f837be5b7b4..8cf516219594 100644 --- a/drivers/char/ftape/Config.in +++ b/drivers/char/ftape/Config.in @@ -1,38 +1,38 @@ # # Ftape configuration # -dep_tristate 'Zftape, the VFS interface' CONFIG_ZFTAPE $CONFIG_FTAPE +dep_tristate ' Zftape, the VFS interface' CONFIG_ZFTAPE $CONFIG_FTAPE if [ "$CONFIG_ZFTAPE" != "n" ]; then - int 'Default block size' CONFIG_ZFT_DFLT_BLK_SZ 10240 - comment 'The compressor will be built as a module only!' + int ' Default block size' CONFIG_ZFT_DFLT_BLK_SZ 10240 + comment ' The compressor will be built as a module only!' define_bool CONFIG_ZFT_COMPRESSOR m fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - int 'Number of ftape buffers (EXPERIMENTAL)' CONFIG_FT_NR_BUFFERS 3 + int ' Number of ftape buffers (EXPERIMENTAL)' CONFIG_FT_NR_BUFFERS 3 fi if [ "$CONFIG_PROC_FS" = "y" ]; then - bool 'Enable procfs status report (+2kb)' CONFIG_FT_PROC_FS y + bool ' Enable procfs status report (+2kb)' CONFIG_FT_PROC_FS y fi -choice 'Debugging output' \ +choice ' Debugging output' \ "Normal CONFIG_FT_NORMAL_DEBUG \ Excessive CONFIG_FT_FULL_DEBUG \ Reduced CONFIG_FT_NO_TRACE \ None CONFIG_FT_NO_TRACE_AT_ALL" Normal -comment 'Hardware configuration' -choice 'Floppy tape controllers' \ +comment ' Hardware configuration' +choice ' Floppy tape controllers' \ "Standard CONFIG_FT_STD_FDC \ MACH-2 CONFIG_FT_MACH2 \ FC-10/FC-20 CONFIG_FT_PROBE_FC10 \ Alt/82078 CONFIG_FT_ALT_FDC" Standard if [ "$CONFIG_FT_STD_FDC" != "y" ]; then - comment ' Consult the manuals of your tape drive for the correct settings!' - hex ' IO base of the floppy disk controller' CONFIG_FT_FDC_BASE 0 + comment ' Consult the manuals of your tape drive for the correct settings!' + hex ' IO base of the floppy disk controller' CONFIG_FT_FDC_BASE 0 int ' IRQ channel of the floppy disk controller' CONFIG_FT_FDC_IRQ 0 int ' DMA channel of the floppy disk controller' CONFIG_FT_FDC_DMA 0 fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - int 'Default FIFO threshold (EXPERIMENTAL)' CONFIG_FT_FDC_THR 8 - int 'Maximal data rate to use (EXPERIMENTAL)' CONFIG_FT_FDC_MAX_RATE 2000 + int ' Default FIFO threshold (EXPERIMENTAL)' CONFIG_FT_FDC_THR 8 + int ' Maximal data rate to use (EXPERIMENTAL)' CONFIG_FT_FDC_MAX_RATE 2000 fi -comment 'ONLY for DEC Alpha architectures' -int 'CPU clock frequency of your DEC Alpha' CONFIG_FT_ALPHA_CLOCK 0 +comment ' ONLY for DEC Alpha architectures' +int ' CPU clock frequency of your DEC Alpha' CONFIG_FT_ALPHA_CLOCK 0 diff --git a/drivers/char/hfmodem/Config.in b/drivers/char/hfmodem/Config.in index 9d2799adb920..b0bb7484f0fc 100644 --- a/drivers/char/hfmodem/Config.in +++ b/drivers/char/hfmodem/Config.in @@ -1,6 +1,6 @@ comment 'Misc. hamradio protocols' -dep_tristate 'Shortwave radio modem driver' CONFIG_HFMODEM $CONFIG_PARPORT +dep_tristate ' Shortwave radio modem driver' CONFIG_HFMODEM $CONFIG_PARPORT if [ "$CONFIG_HFMODEM" != "n" ]; then - bool ' HFmodem support for Soundblaster and compatible cards' CONFIG_HFMODEM_SBC - bool ' HFmodem support for WSS and Crystal cards' CONFIG_HFMODEM_WSS + bool ' HFmodem support for Soundblaster and compatible cards' CONFIG_HFMODEM_SBC + bool ' HFmodem support for WSS and Crystal cards' CONFIG_HFMODEM_WSS fi diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 6ba03747170f..d0e9ecc12685 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -905,6 +905,8 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file, case TIOCSSERIAL: return (moxa_set_serial_info(ch, (struct serial_struct *) arg)); default: + if(!capable(CAP_SYS_RAWIO)) + return -EPERM; retval = MoxaDriverIoctl(cmd, arg, port); } return (retval); diff --git a/drivers/net/Config.in b/drivers/net/Config.in index 3ccfe31f8303..b8e40c32272d 100644 --- a/drivers/net/Config.in +++ b/drivers/net/Config.in @@ -39,139 +39,139 @@ bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET if [ "$CONFIG_NET_ETHERNET" = "y" ]; then if [ "$CONFIG_ARM" = "y" ]; then if [ "$CONFIG_ARCH_ACORN" != "y" ]; then - tristate 'AM79C961A support' CONFIG_ARM_AM79C961A + tristate ' AM79C961A support' CONFIG_ARM_AM79C961A else source drivers/acorn/net/Config.in fi fi if [ "$CONFIG_PPC" = "y" ]; then - tristate 'MACE (Power Mac ethernet) support' CONFIG_MACE + tristate ' MACE (Power Mac ethernet) support' CONFIG_MACE if [ "$CONFIG_MACE" != "n" ]; then - bool 'Use AAUI port instead of TP by default' CONFIG_MACE_AAUI_PORT + bool ' Use AAUI port instead of TP by default' CONFIG_MACE_AAUI_PORT fi - tristate 'BMAC (G3 ethernet) support' CONFIG_BMAC - tristate 'GMAC (G4/iBook ethernet) support' CONFIG_GMAC - tristate 'Symbios 53c885 (Synergy ethernet) support' CONFIG_NCR885E + tristate ' BMAC (G3 ethernet) support' CONFIG_BMAC + tristate ' GMAC (G4/iBook ethernet) support' CONFIG_GMAC + tristate ' Symbios 53c885 (Synergy ethernet) support' CONFIG_NCR885E fi if [ "$CONFIG_ZORRO" = "y" ]; then - tristate 'Ariadne support' CONFIG_ARIADNE - tristate 'Ariadne II support' CONFIG_ARIADNE2 - tristate 'A2065 support' CONFIG_A2065 - tristate 'Hydra support' CONFIG_HYDRA + tristate ' Ariadne support' CONFIG_ARIADNE + tristate ' Ariadne II support' CONFIG_ARIADNE2 + tristate ' A2065 support' CONFIG_A2065 + tristate ' Hydra support' CONFIG_HYDRA fi if [ "$CONFIG_MIPS_JAZZ" = "y" ]; then - tristate 'MIPS JAZZ onboard SONIC Ethernet support' CONFIG_MIPS_JAZZ_SONIC + tristate ' MIPS JAZZ onboard SONIC Ethernet support' CONFIG_MIPS_JAZZ_SONIC fi - bool '3COM cards' CONFIG_NET_VENDOR_3COM + bool ' 3COM cards' CONFIG_NET_VENDOR_3COM if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then - tristate '3c501 support' CONFIG_EL1 - tristate '3c503 support' CONFIG_EL2 - tristate '3c505 support' CONFIG_ELPLUS + tristate ' 3c501 support' CONFIG_EL1 + tristate ' 3c503 support' CONFIG_EL2 + tristate ' 3c505 support' CONFIG_ELPLUS if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate '3c507 support' CONFIG_EL16 + tristate ' 3c507 support' CONFIG_EL16 if [ "$CONFIG_MCA" = "y" ]; then - tristate '3c523 support' CONFIG_ELMC - tristate '3c527 support' CONFIG_ELMC_II + tristate ' 3c523 support' CONFIG_ELMC + tristate ' 3c527 support' CONFIG_ELMC_II fi fi - tristate '3c509/3c579 support' CONFIG_EL3 - tristate '3c515 ISA Fast EtherLink' CONFIG_3C515 - tristate '3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX + tristate ' 3c509/3c579 support' CONFIG_EL3 + tristate ' 3c515 ISA Fast EtherLink' CONFIG_3C515 + tristate ' 3c590/3c900 series (592/595/597) "Vortex/Boomerang" support' CONFIG_VORTEX fi - tristate 'AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE - bool 'Western Digital/SMC cards' CONFIG_NET_VENDOR_SMC + tristate ' AMD LANCE and PCnet (AT1500 and NE2100) support' CONFIG_LANCE + bool ' Western Digital/SMC cards' CONFIG_NET_VENDOR_SMC if [ "$CONFIG_NET_VENDOR_SMC" = "y" ]; then - tristate 'WD80*3 support' CONFIG_WD80x3 + tristate ' WD80*3 support' CONFIG_WD80x3 if [ "$CONFIG_MCA" = "y" ]; then - tristate 'SMC Ultra MCA support' CONFIG_ULTRAMCA + tristate ' SMC Ultra MCA support' CONFIG_ULTRAMCA fi - tristate 'SMC Ultra support' CONFIG_ULTRA - tristate 'SMC Ultra32 EISA support' CONFIG_ULTRA32 - tristate 'SMC 9194 support' CONFIG_SMC9194 + tristate ' SMC Ultra support' CONFIG_ULTRA + tristate ' SMC Ultra32 EISA support' CONFIG_ULTRA32 + tristate ' SMC 9194 support' CONFIG_SMC9194 fi - bool 'Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL + bool ' Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL if [ "$CONFIG_NET_VENDOR_RACAL" = "y" ]; then if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'NI5010 support' CONFIG_NI5010 + tristate ' NI5010 support' CONFIG_NI5010 fi - tristate 'NI5210 support' CONFIG_NI52 - tristate 'NI6510 support' CONFIG_NI65 + tristate ' NI5210 support' CONFIG_NI52 + tristate ' NI6510 support' CONFIG_NI65 fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'RealTek 8129/8139 (not 8019/8029!) support' CONFIG_RTL8139 + tristate ' RealTek 8129/8139 (not 8019/8029!) support' CONFIG_RTL8139 fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Alternative RealTek 8129/8139 driver (8139too) support' CONFIG_RTL8139TOO + tristate ' Alternative RealTek 8129/8139 driver (8139too) support' CONFIG_RTL8139TOO if [ "$CONFIG_RTL8139TOO" != "n" ]; then - bool ' Use PIO instead of MMIO' CONFIG_8139TOO_PIO - bool ' Support for automatic channel equalization' CONFIG_8139TOO_TUNE_TWISTER - bool ' Support for 8129' CONFIG_8139TOO_8129 + bool ' Use PIO instead of MMIO' CONFIG_8139TOO_PIO + bool ' Support for automatic channel equalization' CONFIG_8139TOO_TUNE_TWISTER + bool ' Support for 8129' CONFIG_8139TOO_8129 fi fi - bool 'Other ISA cards' CONFIG_NET_ISA + bool ' Other ISA cards' CONFIG_NET_ISA if [ "$CONFIG_NET_ISA" = "y" ]; then - tristate 'AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700 - tristate 'Cabletron E21xx support' CONFIG_E2100 - tristate 'DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA - tristate 'EtherWORKS 3 (DE203, DE204, DE205) support' CONFIG_EWRK3 - tristate 'EtherExpress 16 support' CONFIG_EEXPRESS - tristate 'EtherExpressPro/EtherExpress 10 (i82595) support' CONFIG_EEXPRESS_PRO - tristate 'FMV-181/182/183/184 support' CONFIG_FMV18X - tristate 'HP PCLAN+ (27247B and 27252A) support' CONFIG_HPLAN_PLUS - tristate 'HP PCLAN (27245 and other 27xxx series) support' CONFIG_HPLAN - tristate 'HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100 + tristate ' AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700 + tristate ' Cabletron E21xx support' CONFIG_E2100 + tristate ' DEPCA, DE10x, DE200, DE201, DE202, DE422 support' CONFIG_DEPCA + tristate ' EtherWORKS 3 (DE203, DE204, DE205) support' CONFIG_EWRK3 + tristate ' EtherExpress 16 support' CONFIG_EEXPRESS + tristate ' EtherExpressPro/EtherExpress 10 (i82595) support' CONFIG_EEXPRESS_PRO + tristate ' FMV-181/182/183/184 support' CONFIG_FMV18X + tristate ' HP PCLAN+ (27247B and 27252A) support' CONFIG_HPLAN_PLUS + tristate ' HP PCLAN (27245 and other 27xxx series) support' CONFIG_HPLAN + tristate ' HP 10/100VG PCLAN (ISA, EISA, PCI) support' CONFIG_HP100 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'ICL EtherTeam 16i/32 support' CONFIG_ETH16I + tristate ' ICL EtherTeam 16i/32 support' CONFIG_ETH16I fi - tristate 'NE2000/NE1000 support' CONFIG_NE2000 + tristate ' NE2000/NE1000 support' CONFIG_NE2000 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'SEEQ8005 support (EXPERIMENTAL)' CONFIG_SEEQ8005 + tristate ' SEEQ8005 support (EXPERIMENTAL)' CONFIG_SEEQ8005 fi - bool 'SK_G16 support' CONFIG_SK_G16 + bool ' SK_G16 support' CONFIG_SK_G16 fi if [ "$CONFIG_MCA" = "y" ]; then - tristate 'NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA - tristate 'SKnet MCA support' CONFIG_SKMC + tristate ' NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA + tristate ' SKnet MCA support' CONFIG_SKMC fi - bool 'EISA, VLB, PCI and on board controllers' CONFIG_NET_EISA + bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_EISA if [ "$CONFIG_NET_EISA" = "y" ]; then - tristate 'AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32 - tristate 'Adaptec Starfire/DuraLAN support' CONFIG_ADAPTEC_STARFIRE + tristate ' AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32 + tristate ' Adaptec Starfire/DuraLAN support' CONFIG_ADAPTEC_STARFIRE if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200 + tristate ' Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200 fi - tristate 'Apricot Xen-II on board Ethernet' CONFIG_APRICOT - tristate 'LP486E on board Ethernet' CONFIG_LP486E - tristate 'CS89x0 support' CONFIG_CS89x0 + tristate ' Apricot Xen-II on board Ethernet' CONFIG_APRICOT + tristate ' LP486E on board Ethernet' CONFIG_LP486E + tristate ' CS89x0 support' CONFIG_CS89x0 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'DM9102 PCI Fast Ethernet Adapter support (EXPERIMENTAL)' CONFIG_DM9102 + tristate ' DM9102 PCI Fast Ethernet Adapter support (EXPERIMENTAL)' CONFIG_DM9102 fi - tristate 'Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5 - tristate 'DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP + tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5 + tristate ' DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP if [ "$CONFIG_DEC_ELCP" != "y" ]; then - tristate 'Old DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP_OLD + tristate ' Old DECchip Tulip (dc21x4x) PCI support' CONFIG_DEC_ELCP_OLD fi - tristate 'Digi Intl. RightSwitch SE-X support' CONFIG_DGRS - tristate 'EtherExpressPro/100 support' CONFIG_EEXPRESS_PRO100 + tristate ' Digi Intl. RightSwitch SE-X support' CONFIG_DGRS + tristate ' EtherExpressPro/100 support' CONFIG_EEXPRESS_PRO100 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390 - tristate 'Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210 + tristate ' Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390 + tristate ' Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210 fi - tristate 'PCI NE2000 support' CONFIG_NE2K_PCI - tristate 'TI ThunderLAN support' CONFIG_TLAN - tristate 'VIA Rhine support' CONFIG_VIA_RHINE - tristate 'SiS 900/7016 PCI Fast Ethernet Adapter support' CONFIG_SIS900 + tristate ' PCI NE2000 support' CONFIG_NE2K_PCI + tristate ' TI ThunderLAN support' CONFIG_TLAN + tristate ' VIA Rhine support' CONFIG_VIA_RHINE + tristate ' SiS 900/7016 PCI Fast Ethernet Adapter support' CONFIG_SIS900 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210 - tristate 'SMC EtherPower II (EXPERIMENTAL)' CONFIG_EPIC100 - bool 'Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET + tristate ' Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210 + tristate ' SMC EtherPower II (EXPERIMENTAL)' CONFIG_EPIC100 + bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET fi fi - bool 'Pocket and portable adaptors' CONFIG_NET_POCKET + bool ' Pocket and portable adaptors' CONFIG_NET_POCKET if [ "$CONFIG_NET_POCKET" = "y" ]; then - bool 'AT-LAN-TEC/RealTek pocket adaptor support' CONFIG_ATP - tristate 'D-Link DE600 pocket adaptor support' CONFIG_DE600 - tristate 'D-Link DE620 pocket adaptor support' CONFIG_DE620 + bool ' AT-LAN-TEC/RealTek pocket adaptor support' CONFIG_ATP + tristate ' D-Link DE600 pocket adaptor support' CONFIG_DE600 + tristate ' D-Link DE620 pocket adaptor support' CONFIG_DE620 fi fi @@ -183,15 +183,17 @@ endmenu mainmenu_option next_comment comment 'Ethernet (1000 Mbit)' - - if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC - tristate 'Packet Engines GNIC-II (Hamachi) support' CONFIG_HAMACHI - tristate 'Packet Engines Yellowfin Gigabit-NIC support' CONFIG_YELLOWFIN - fi - if [ "$CONFIG_PCI" = "y" ]; then - tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN - fi +bool 'Ethernet (1000 Mbit)' CONFIG_NET_GIGABIT_ETH +if [ "$CONFIG_NET_GIGABIT_ETH" = "y" ]; then + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + tristate ' Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC + tristate ' Packet Engines GNIC-II (Hamachi) support' CONFIG_HAMACHI + tristate ' Packet Engines Yellowfin Gigabit-NIC support' CONFIG_YELLOWFIN + fi + if [ "$CONFIG_PCI" = "y" ]; then + tristate ' SysKonnect SK-98xx support' CONFIG_SK98LIN + fi +fi endmenu bool 'FDDI driver support' CONFIG_FDDI @@ -205,9 +207,9 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI fi if [ "$CONFIG_HIPPI" = "y" ]; then - tristate 'Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER + tristate ' Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER if [ "$CONFIG_ROADRUNNER" != "n" ]; then - bool ' Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS + bool ' Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS fi fi fi @@ -244,16 +246,16 @@ fi tristate 'SLIP (serial line) support' CONFIG_SLIP if [ "$CONFIG_SLIP" != "n" ]; then - bool ' CSLIP compressed headers' CONFIG_SLIP_COMPRESSED - bool ' Keepalive and linefill' CONFIG_SLIP_SMART - bool ' Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6 + bool ' CSLIP compressed headers' CONFIG_SLIP_COMPRESSED + bool ' Keepalive and linefill' CONFIG_SLIP_SMART + bool ' Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6 fi bool 'Wireless LAN (non-hamradio)' CONFIG_NET_RADIO if [ "$CONFIG_NET_RADIO" = "y" ]; then - dep_tristate 'STRIP (Metricom starmode radio IP)' CONFIG_STRIP $CONFIG_INET - tristate 'AT&T WaveLAN & DEC RoamAbout DS support' CONFIG_WAVELAN - tristate 'Aironet Arlan 655 & IC2200 DS support' CONFIG_ARLAN + dep_tristate ' STRIP (Metricom starmode radio IP)' CONFIG_STRIP $CONFIG_INET + tristate ' AT&T WaveLAN & DEC RoamAbout DS support' CONFIG_WAVELAN + tristate ' Aironet Arlan 655 & IC2200 DS support' CONFIG_ARLAN fi @@ -262,17 +264,17 @@ comment 'Token ring devices' bool 'Token Ring driver support' CONFIG_TR if [ "$CONFIG_TR" = "y" ]; then - tristate 'IBM Tropic chipset based adaptor support' CONFIG_IBMTR - tristate 'IBM Lanstreamer PCI adaptor support' CONFIG_IBMLS - tristate 'IBM Olympic chipset PCI adapter support' CONFIG_IBMOL - tristate 'SysKonnect adapter support' CONFIG_SKTR + tristate ' IBM Tropic chipset based adaptor support' CONFIG_IBMTR + tristate ' IBM Lanstreamer PCI adaptor support' CONFIG_IBMLS + tristate ' IBM Olympic chipset PCI adapter support' CONFIG_IBMOL + tristate ' SysKonnect adapter support' CONFIG_SKTR fi endmenu bool 'Fibre Channel driver support' CONFIG_NET_FC if [ "$CONFIG_NET_FC" = "y" ]; then - dep_tristate 'Interphase 5526 Tachyon chipset based adaptor support' CONFIG_IPHASE5526 $CONFIG_SCSI + dep_tristate ' Interphase 5526 Tachyon chipset based adaptor support' CONFIG_IPHASE5526 $CONFIG_SCSI fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then @@ -286,64 +288,65 @@ fi mainmenu_option next_comment comment 'Wan interfaces' - +bool 'Wan interfaces support' CONFIG_WAN +if [ "$CONFIG_WAN" = "y" ]; then # There is no way to detect a comtrol sv11 - force it modular for now. # -dep_tristate 'Comtrol Hostess SV-11 support' CONFIG_HOSTESS_SV11 m +dep_tristate ' Comtrol Hostess SV-11 support' CONFIG_HOSTESS_SV11 m # # The COSA/SRP driver has not been tested as non-modular yet. # -dep_tristate 'COSA/SRP sync serial boards support' CONFIG_COSA m +dep_tristate ' COSA/SRP sync serial boards support' CONFIG_COSA m # # There is no way to detect a Sealevel board. Force it modular # -dep_tristate 'Sealevel Systems 4021 support' CONFIG_SEALEVEL_4021 m +dep_tristate ' Sealevel Systems 4021 support' CONFIG_SEALEVEL_4021 m # # Microgate Synclink HDLC/SYNCPPP support # -tristate 'SyncLink HDLC/SYNCPPP support' CONFIG_SYNCLINK_SYNCPPP +tristate ' SyncLink HDLC/SYNCPPP support' CONFIG_SYNCLINK_SYNCPPP # FarSite Communications' cards -tristate 'FarSync T-Series X.21 (and V.35/V.24) cards' CONFIG_FARSYNC +tristate ' FarSync T-Series X.21 (and V.35/V.24) cards' CONFIG_FARSYNC # # Lan Media's board. Currently 1000, 1200, 5200, 5245 # -tristate 'LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards' CONFIG_LANMEDIA +tristate ' LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards' CONFIG_LANMEDIA # # COMX drivers # -tristate 'MultiGate (COMX) synchronous serial boards support' CONFIG_COMX +tristate ' MultiGate (COMX) synchronous serial boards support' CONFIG_COMX if [ "$CONFIG_COMX" != "n" ]; then - dep_tristate ' Support for COMX/CMX/HiCOMX boards' CONFIG_COMX_HW_COMX $CONFIG_COMX - dep_tristate ' Support for LoCOMX board' CONFIG_COMX_HW_LOCOMX $CONFIG_COMX - dep_tristate ' Support for MixCOM board' CONFIG_COMX_HW_MIXCOM $CONFIG_COMX - dep_tristate ' Support for HDLC and syncPPP protocols on MultiGate boards' CONFIG_COMX_PROTO_PPP $CONFIG_COMX + dep_tristate ' Support for COMX/CMX/HiCOMX boards' CONFIG_COMX_HW_COMX $CONFIG_COMX + dep_tristate ' Support for LoCOMX board' CONFIG_COMX_HW_LOCOMX $CONFIG_COMX + dep_tristate ' Support for MixCOM board' CONFIG_COMX_HW_MIXCOM $CONFIG_COMX + dep_tristate ' Support for HDLC and syncPPP protocols on MultiGate boards' CONFIG_COMX_PROTO_PPP $CONFIG_COMX if [ "$CONFIG_LAPB" = "y" ]; then - dep_tristate ' Support for LAPB protocol on MultiGate boards' CONFIG_COMX_PROTO_LAPB $CONFIG_COMX + dep_tristate ' Support for LAPB protocol on MultiGate boards' CONFIG_COMX_PROTO_LAPB $CONFIG_COMX fi if [ "$CONFIG_LAPB" = "m" ]; then - dep_tristate ' Support for LAPB protocol on MultiGate boards' CONFIG_COMX_PROTO_LAPB $CONFIG_LAPB + dep_tristate ' Support for LAPB protocol on MultiGate boards' CONFIG_COMX_PROTO_LAPB $CONFIG_LAPB fi - dep_tristate ' Support for Frame Relay on MultiGate boards' CONFIG_COMX_PROTO_FR $CONFIG_COMX + dep_tristate ' Support for Frame Relay on MultiGate boards' CONFIG_COMX_PROTO_FR $CONFIG_COMX fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Generic HDLC driver (EXPERIMENTAL)' CONFIG_HDLC + tristate ' Generic HDLC driver (EXPERIMENTAL)' CONFIG_HDLC if [ "$CONFIG_HDLC" != "n" ]; then - dep_tristate ' SDL RISCom/N2 support' CONFIG_N2 $CONFIG_HDLC - dep_tristate ' Moxa C101 support' CONFIG_C101 $CONFIG_HDLC + dep_tristate ' SDL RISCom/N2 support' CONFIG_N2 $CONFIG_HDLC + dep_tristate ' Moxa C101 support' CONFIG_C101 $CONFIG_HDLC if [ "$CONFIG_PCI" = "y" ]; then - dep_tristate ' SBE wanXL support' CONFIG_WANXL $CONFIG_HDLC - dep_tristate ' Cyclades-PC300 support' CONFIG_PC300 $CONFIG_HDLC + dep_tristate ' SBE wanXL support' CONFIG_WANXL $CONFIG_HDLC + dep_tristate ' Cyclades-PC300 support' CONFIG_PC300 $CONFIG_HDLC if [ "$CONFIG_PC300" != "n" ]; then - bool ' Cyclades-PC300 X.25 support (please read help)' CONFIG_PC300_X25 + bool ' Cyclades-PC300 X.25 support (please read help)' CONFIG_PC300_X25 fi fi fi @@ -354,11 +357,11 @@ if [ "$CONFIG_HDLC" = "y" -o "$CONFIG_SYNCLINK_SYNCPPP" = "y" -o \ define_bool CONFIG_SYNCPPP y fi -tristate 'Frame relay DLCI support' CONFIG_DLCI +tristate ' Frame relay DLCI support' CONFIG_DLCI if [ "$CONFIG_DLCI" != "n" ]; then - int ' Max open DLCI' CONFIG_DLCI_COUNT 24 - int ' Max DLCI per device' CONFIG_DLCI_MAX 8 - dep_tristate ' SDLA (Sangoma S502/S508) support' CONFIG_SDLA $CONFIG_DLCI + int ' Max open DLCI' CONFIG_DLCI_COUNT 24 + int ' Max DLCI per device' CONFIG_DLCI_MAX 8 + dep_tristate ' SDLA (Sangoma S502/S508) support' CONFIG_SDLA $CONFIG_DLCI fi # @@ -367,16 +370,16 @@ fi # CONFIG_WAN_ROUTER is defined only when CONFIG_EXPERIMENTAL=y if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_WAN_ROUTER" != "n" ]; then - bool 'WAN drivers' CONFIG_WAN_DRIVERS + bool ' WAN drivers' CONFIG_WAN_DRIVERS if [ "$CONFIG_WAN_DRIVERS" = "y" ]; then - dep_tristate 'Sangoma WANPIPE(tm) multi-port cards: (select M not Y !)' CONFIG_VENDOR_SANGOMA $CONFIG_WAN_DRIVERS + dep_tristate ' Sangoma WANPIPE(tm) multi-port cards: (select M not Y !)' CONFIG_VENDOR_SANGOMA $CONFIG_WAN_DRIVERS if [ "$CONFIG_INET" != "n" ]; then if [ "$CONFIG_VENDOR_SANGOMA" != "n" ]; then - int ' Maximum number of cards' CONFIG_WANPIPE_CARDS 1 - #bool ' WANPIPE X.25 support' CONFIG_WANPIPE_X25 - bool ' WANPIPE Frame Relay support' CONFIG_WANPIPE_FR - bool ' WANPIPE PPP support' CONFIG_WANPIPE_PPP - bool ' WANPIPE Cisco HDLC support' CONFIG_WANPIPE_CHDLC + int ' Maximum number of cards' CONFIG_WANPIPE_CARDS 1 + #bool ' WANPIPE X.25 support' CONFIG_WANPIPE_X25 + bool ' WANPIPE Frame Relay support' CONFIG_WANPIPE_FR + bool ' WANPIPE PPP support' CONFIG_WANPIPE_PPP + bool ' WANPIPE Cisco HDLC support' CONFIG_WANPIPE_CHDLC fi fi fi @@ -386,9 +389,10 @@ fi # Xpeed drivers # if [ "$CONFIG_PCI" = "y" ]; then - tristate 'Xpeed X200/X300 DSL NIC support' CONFIG_XPEED + tristate ' Xpeed X200/X300 DSL NIC support' CONFIG_XPEED fi +fi endmenu # diff --git a/drivers/net/hamradio/Config.in b/drivers/net/hamradio/Config.in index 7e2fc8f4fe23..f8edb7b7b25d 100644 --- a/drivers/net/hamradio/Config.in +++ b/drivers/net/hamradio/Config.in @@ -1,3 +1,4 @@ +mainmenu_option next_comment comment 'AX.25 network device drivers' dep_tristate 'Serial port KISS driver' CONFIG_MKISS $CONFIG_AX25 @@ -7,8 +8,8 @@ dep_tristate 'BPQ Ethernet driver' CONFIG_BPQETHER $CONFIG_AX25 dep_tristate 'High-speed (DMA) SCC driver for AX.25' CONFIG_DMASCC $CONFIG_AX25 dep_tristate 'Z8530 SCC driver' CONFIG_SCC $CONFIG_AX25 if [ "$CONFIG_SCC" != "n" ]; then - bool ' additional delay for PA0HZP OptoSCC compatible boards' CONFIG_SCC_DELAY - bool ' support for TRX that feedback the tx signal to rx' CONFIG_SCC_TRXECHO + bool ' additional delay for PA0HZP OptoSCC compatible boards' CONFIG_SCC_DELAY + bool ' support for TRX that feedback the tx signal to rx' CONFIG_SCC_TRXECHO fi dep_tristate 'BAYCOM ser12 fullduplex driver for AX.25' CONFIG_BAYCOM_SER_FDX $CONFIG_AX25 @@ -18,15 +19,16 @@ dep_tristate 'BAYCOM epp driver for AX.25' CONFIG_BAYCOM_EPP $CONFIG_PARPORT $CO dep_tristate 'Soundcard modem driver' CONFIG_SOUNDMODEM $CONFIG_AX25 if [ "$CONFIG_SOUNDMODEM" != "n" ]; then - bool ' soundmodem support for Soundblaster and compatible cards' CONFIG_SOUNDMODEM_SBC - bool ' soundmodem support for WSS and Crystal cards' CONFIG_SOUNDMODEM_WSS - bool ' soundmodem support for 1200 baud AFSK modulation' CONFIG_SOUNDMODEM_AFSK1200 - bool ' soundmodem support for 2400 baud AFSK modulation (7.3728MHz crystal)' CONFIG_SOUNDMODEM_AFSK2400_7 - bool ' soundmodem support for 2400 baud AFSK modulation (8MHz crystal)' CONFIG_SOUNDMODEM_AFSK2400_8 - bool ' soundmodem support for 2666 baud AFSK modulation' CONFIG_SOUNDMODEM_AFSK2666 - bool ' soundmodem support for 4800 baud HAPN-1 modulation' CONFIG_SOUNDMODEM_HAPN4800 - bool ' soundmodem support for 4800 baud PSK modulation' CONFIG_SOUNDMODEM_PSK4800 - bool ' soundmodem support for 9600 baud FSK G3RUH modulation' CONFIG_SOUNDMODEM_FSK9600 + bool ' soundmodem support for Soundblaster and compatible cards' CONFIG_SOUNDMODEM_SBC + bool ' soundmodem support for WSS and Crystal cards' CONFIG_SOUNDMODEM_WSS + bool ' soundmodem support for 1200 baud AFSK modulation' CONFIG_SOUNDMODEM_AFSK1200 + bool ' soundmodem support for 2400 baud AFSK modulation (7.3728MHz crystal)' CONFIG_SOUNDMODEM_AFSK2400_7 + bool ' soundmodem support for 2400 baud AFSK modulation (8MHz crystal)' CONFIG_SOUNDMODEM_AFSK2400_8 + bool ' soundmodem support for 2666 baud AFSK modulation' CONFIG_SOUNDMODEM_AFSK2666 + bool ' soundmodem support for 4800 baud HAPN-1 modulation' CONFIG_SOUNDMODEM_HAPN4800 + bool ' soundmodem support for 4800 baud PSK modulation' CONFIG_SOUNDMODEM_PSK4800 + bool ' soundmodem support for 9600 baud FSK G3RUH modulation' CONFIG_SOUNDMODEM_FSK9600 fi dep_tristate 'YAM driver for AX.25' CONFIG_YAM $CONFIG_AX25 +endmenu diff --git a/drivers/scsi/Config.in b/drivers/scsi/Config.in index fe12eb6fa252..e713ce3562be 100644 --- a/drivers/scsi/Config.in +++ b/drivers/scsi/Config.in @@ -1,147 +1,158 @@ -comment 'SCSI support type (disk, tape, CD-ROM)' +mainmenu_option next_comment +comment 'SCSI support' + +tristate 'SCSI support' CONFIG_SCSI + +if [ "$CONFIG_SCSI" != "n" ]; then -dep_tristate 'SCSI disk support' CONFIG_BLK_DEV_SD $CONFIG_SCSI -dep_tristate 'SCSI tape support' CONFIG_CHR_DEV_ST $CONFIG_SCSI -dep_tristate 'OnStream SC-x0 SCSI tape support' CONFIG_CHR_DEV_OSST $CONFIG_SCSI -dep_tristate 'SCSI CD-ROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI +comment ' SCSI support type (disk, tape, CD-ROM)' + +dep_tristate ' SCSI disk support' CONFIG_BLK_DEV_SD $CONFIG_SCSI +dep_tristate ' SCSI tape support' CONFIG_CHR_DEV_ST $CONFIG_SCSI +dep_tristate ' OnStream SC-x0 SCSI tape support' CONFIG_CHR_DEV_OSST $CONFIG_SCSI +dep_tristate ' SCSI CD-ROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then - bool ' Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR + bool ' Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR fi -dep_tristate 'SCSI generic support' CONFIG_CHR_DEV_SG $CONFIG_SCSI +dep_tristate ' SCSI generic support' CONFIG_CHR_DEV_SG $CONFIG_SCSI -comment 'Some SCSI devices (e.g. CD jukebox) support multiple LUNs' +comment ' Some SCSI devices (e.g. CD jukebox) support multiple LUNs' -bool 'Probe all LUNs on each SCSI device' CONFIG_SCSI_MULTI_LUN +bool ' Probe all LUNs on each SCSI device' CONFIG_SCSI_MULTI_LUN -bool 'Verbose SCSI error reporting (kernel size +=12K)' CONFIG_SCSI_CONSTANTS -bool 'SCSI logging facility' CONFIG_SCSI_LOGGING +bool ' Verbose SCSI error reporting (kernel size +=12K)' CONFIG_SCSI_CONSTANTS +bool ' SCSI logging facility' CONFIG_SCSI_LOGGING mainmenu_option next_comment -comment 'SCSI low-level drivers' +comment ' SCSI low-level drivers' +bool 'SCSI low-level drivers' CONFIG_SCSI_LOWLEVEL -if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate '3ware Hardware ATA-RAID support (EXPERIMENTAL)' CONFIG_BLK_DEV_3W_XXXX_RAID $CONFIG_SCSI -fi -dep_tristate '7000FASST SCSI support' CONFIG_SCSI_7000FASST $CONFIG_SCSI -dep_tristate 'ACARD SCSI support' CONFIG_SCSI_ACARD $CONFIG_SCSI -dep_tristate 'Adaptec AHA152X/2825 support' CONFIG_SCSI_AHA152X $CONFIG_SCSI -dep_tristate 'Adaptec AHA1542 support' CONFIG_SCSI_AHA1542 $CONFIG_SCSI -dep_tristate 'Adaptec AHA1740 support' CONFIG_SCSI_AHA1740 $CONFIG_SCSI -dep_tristate 'Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI +if [ "$CONFIG_SCSI_LOWLEVEL" != "n" ]; then + +if [ "$CONFIG_PCI" = "y" ]; then + dep_tristate ' 3ware Hardware ATA-RAID support' CONFIG_BLK_DEV_3W_XXXX_RAID $CONFIG_SCSI +fi +dep_tristate ' 7000FASST SCSI support' CONFIG_SCSI_7000FASST $CONFIG_SCSI +dep_tristate ' ACARD SCSI support' CONFIG_SCSI_ACARD $CONFIG_SCSI +dep_tristate ' Adaptec AHA152X/2825 support' CONFIG_SCSI_AHA152X $CONFIG_SCSI +dep_tristate ' Adaptec AHA1542 support' CONFIG_SCSI_AHA1542 $CONFIG_SCSI +dep_tristate ' Adaptec AHA1740 support' CONFIG_SCSI_AHA1740 $CONFIG_SCSI +dep_tristate ' Adaptec AIC7xxx support' CONFIG_SCSI_AIC7XXX $CONFIG_SCSI if [ "$CONFIG_SCSI_AIC7XXX" != "n" ]; then - bool ' Enable Tagged Command Queueing (TCQ) by default' CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT - int ' Maximum number of TCQ commands per device' CONFIG_AIC7XXX_CMDS_PER_DEVICE 24 - bool ' Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS -fi -dep_tristate 'IBM ServeRAID support' CONFIG_SCSI_IPS $CONFIG_SCSI -dep_tristate 'AdvanSys SCSI support' CONFIG_SCSI_ADVANSYS $CONFIG_SCSI -dep_tristate 'Always IN2000 SCSI support' CONFIG_SCSI_IN2000 $CONFIG_SCSI -dep_tristate 'AM53/79C974 PCI SCSI support' CONFIG_SCSI_AM53C974 $CONFIG_SCSI -dep_tristate 'AMI MegaRAID support' CONFIG_SCSI_MEGARAID $CONFIG_SCSI + bool ' Enable Tagged Command Queueing (TCQ) by default' CONFIG_AIC7XXX_TCQ_ON_BY_DEFAULT + int ' Maximum number of TCQ commands per device' CONFIG_AIC7XXX_CMDS_PER_DEVICE 24 + bool ' Collect statistics to report in /proc' CONFIG_AIC7XXX_PROC_STATS +fi +dep_tristate ' IBM ServeRAID support' CONFIG_SCSI_IPS $CONFIG_SCSI +dep_tristate ' AdvanSys SCSI support' CONFIG_SCSI_ADVANSYS $CONFIG_SCSI +dep_tristate ' Always IN2000 SCSI support' CONFIG_SCSI_IN2000 $CONFIG_SCSI +dep_tristate ' AM53/79C974 PCI SCSI support' CONFIG_SCSI_AM53C974 $CONFIG_SCSI +dep_tristate ' AMI MegaRAID support' CONFIG_SCSI_MEGARAID $CONFIG_SCSI -dep_tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC $CONFIG_SCSI +dep_tristate ' BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC $CONFIG_SCSI if [ "$CONFIG_SCSI_BUSLOGIC" != "n" ]; then - bool ' Omit FlashPoint support' CONFIG_SCSI_OMIT_FLASHPOINT + bool ' Omit FlashPoint support' CONFIG_SCSI_OMIT_FLASHPOINT fi if [ "$CONFIG_PCI" = "y" ]; then - dep_tristate 'Compaq Fibre Channel 64-bit/66Mhz HBA support' CONFIG_SCSI_CPQFCTS $CONFIG_SCSI + dep_tristate ' Compaq Fibre Channel 64-bit/66Mhz HBA support' CONFIG_SCSI_CPQFCTS $CONFIG_SCSI fi -dep_tristate 'DTC3180/3280 SCSI support' CONFIG_SCSI_DTC3280 $CONFIG_SCSI -dep_tristate 'EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support' CONFIG_SCSI_EATA $CONFIG_SCSI +dep_tristate ' DTC3180/3280 SCSI support' CONFIG_SCSI_DTC3280 $CONFIG_SCSI +dep_tristate ' EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support' CONFIG_SCSI_EATA $CONFIG_SCSI if [ "$CONFIG_SCSI_EATA" != "n" ]; then - bool ' enable tagged command queueing' CONFIG_SCSI_EATA_TAGGED_QUEUE - bool ' enable elevator sorting' CONFIG_SCSI_EATA_LINKED_COMMANDS - int ' maximum number of queued commands' CONFIG_SCSI_EATA_MAX_TAGS 16 + bool ' enable tagged command queueing' CONFIG_SCSI_EATA_TAGGED_QUEUE + bool ' enable elevator sorting' CONFIG_SCSI_EATA_LINKED_COMMANDS + int ' maximum number of queued commands' CONFIG_SCSI_EATA_MAX_TAGS 16 fi -dep_tristate 'EATA-DMA [Obsolete] (DPT, NEC, AT&T, SNI, AST, Olivetti, Alphatronix) support' CONFIG_SCSI_EATA_DMA $CONFIG_SCSI -dep_tristate 'EATA-PIO (old DPT PM2001, PM2012A) support' CONFIG_SCSI_EATA_PIO $CONFIG_SCSI -dep_tristate 'Future Domain 16xx SCSI/AHA-2920A support' CONFIG_SCSI_FUTURE_DOMAIN $CONFIG_SCSI +dep_tristate ' EATA-DMA [Obsolete] (DPT, NEC, AT&T, SNI, AST, Olivetti, Alphatronix) support' CONFIG_SCSI_EATA_DMA $CONFIG_SCSI +dep_tristate ' EATA-PIO (old DPT PM2001, PM2012A) support' CONFIG_SCSI_EATA_PIO $CONFIG_SCSI +dep_tristate ' Future Domain 16xx SCSI/AHA-2920A support' CONFIG_SCSI_FUTURE_DOMAIN $CONFIG_SCSI if [ "$CONFIG_MCA" = "y" ]; then - dep_tristate 'Future Domain MCS-600/700 SCSI support' CONFIG_SCSI_FD_MCS $CONFIG_SCSI + dep_tristate ' Future Domain MCS-600/700 SCSI support' CONFIG_SCSI_FD_MCS $CONFIG_SCSI fi -dep_tristate 'GDT SCSI Disk Array Controller support' CONFIG_SCSI_GDTH $CONFIG_SCSI -dep_tristate 'Generic NCR5380/53c400 SCSI support' CONFIG_SCSI_GENERIC_NCR5380 $CONFIG_SCSI +dep_tristate ' GDT SCSI Disk Array Controller support' CONFIG_SCSI_GDTH $CONFIG_SCSI +dep_tristate ' Generic NCR5380/53c400 SCSI support' CONFIG_SCSI_GENERIC_NCR5380 $CONFIG_SCSI if [ "$CONFIG_SCSI_GENERIC_NCR5380" != "n" ]; then - bool ' Enable NCR53c400 extensions' CONFIG_SCSI_GENERIC_NCR53C400 + bool ' Enable NCR53c400 extensions' CONFIG_SCSI_GENERIC_NCR53C400 choice 'NCR5380/53c400 mapping method (use Port for T130B)' \ "Port CONFIG_SCSI_G_NCR5380_PORT \ Memory CONFIG_SCSI_G_NCR5380_MEM" Port fi if [ "$CONFIG_PCI" = "y" ]; then - dep_tristate 'Initio 9100U(W) support' CONFIG_SCSI_INITIO $CONFIG_SCSI - dep_tristate 'Initio INI-A100U2W support' CONFIG_SCSI_INIA100 $CONFIG_SCSI + dep_tristate ' Initio 9100U(W) support' CONFIG_SCSI_INITIO $CONFIG_SCSI + dep_tristate ' Initio INI-A100U2W support' CONFIG_SCSI_INIA100 $CONFIG_SCSI fi if [ "$CONFIG_PARPORT" = "y" -o "$CONFIG_PARPORT" = "m" ]; then - dep_tristate 'IOMEGA parallel port (ppa - older drives)' CONFIG_SCSI_PPA $CONFIG_SCSI $CONFIG_PARPORT - dep_tristate 'IOMEGA parallel port (imm - newer drives)' CONFIG_SCSI_IMM $CONFIG_SCSI $CONFIG_PARPORT + dep_tristate ' IOMEGA parallel port (ppa - older drives)' CONFIG_SCSI_PPA $CONFIG_SCSI $CONFIG_PARPORT + dep_tristate ' IOMEGA parallel port (imm - newer drives)' CONFIG_SCSI_IMM $CONFIG_SCSI $CONFIG_PARPORT if [ "$CONFIG_SCSI_PPA" != "n" -o "$CONFIG_SCSI_IMM" != "n" ]; then - bool ' ppa/imm option - Use slow (but safe) EPP-16' CONFIG_SCSI_IZIP_EPP16 - bool ' ppa/imm option - Assume slow parport control register' CONFIG_SCSI_IZIP_SLOW_CTR + bool ' ppa/imm option - Use slow (but safe) EPP-16' CONFIG_SCSI_IZIP_EPP16 + bool ' ppa/imm option - Assume slow parport control register' CONFIG_SCSI_IZIP_SLOW_CTR fi fi -dep_tristate 'NCR53c406a SCSI support' CONFIG_SCSI_NCR53C406A $CONFIG_SCSI -dep_tristate 'symbios 53c416 SCSI support' CONFIG_SCSI_SYM53C416 $CONFIG_SCSI -dep_tristate 'Simple 53c710 SCSI support (Compaq, NCR machines)' CONFIG_SCSI_SIM710 $CONFIG_SCSI + +dep_tristate ' NCR53c406a SCSI support' CONFIG_SCSI_NCR53C406A $CONFIG_SCSI +dep_tristate ' symbios 53c416 SCSI support' CONFIG_SCSI_SYM53C416 $CONFIG_SCSI +dep_tristate ' Simple 53c710 SCSI support (Compaq, NCR machines)' CONFIG_SCSI_SIM710 $CONFIG_SCSI if [ "$CONFIG_PCI" = "y" ]; then - dep_tristate 'NCR53c7,8xx SCSI support' CONFIG_SCSI_NCR53C7xx $CONFIG_SCSI + dep_tristate ' NCR53c7,8xx SCSI support' CONFIG_SCSI_NCR53C7xx $CONFIG_SCSI if [ "$CONFIG_SCSI_NCR53C7xx" != "n" ]; then - bool ' always negotiate synchronous transfers' CONFIG_SCSI_NCR53C7xx_sync - bool ' allow FAST-SCSI [10MHz]' CONFIG_SCSI_NCR53C7xx_FAST - bool ' allow DISCONNECT' CONFIG_SCSI_NCR53C7xx_DISCONNECT + bool ' always negotiate synchronous transfers' CONFIG_SCSI_NCR53C7xx_sync + bool ' allow FAST-SCSI [10MHz]' CONFIG_SCSI_NCR53C7xx_FAST + bool ' allow DISCONNECT' CONFIG_SCSI_NCR53C7xx_DISCONNECT fi fi if [ "$CONFIG_PCI" = "y" -a "$CONFIG_SCSI_NCR53C7xx" != "y" ]; then - dep_tristate 'NCR53C8XX SCSI support' CONFIG_SCSI_NCR53C8XX $CONFIG_SCSI - dep_tristate 'SYM53C8XX SCSI support' CONFIG_SCSI_SYM53C8XX $CONFIG_SCSI + dep_tristate ' NCR53C8XX SCSI support' CONFIG_SCSI_NCR53C8XX $CONFIG_SCSI + dep_tristate ' SYM53C8XX SCSI support' CONFIG_SCSI_SYM53C8XX $CONFIG_SCSI if [ "$CONFIG_SCSI_NCR53C8XX" != "n" -o "$CONFIG_SCSI_SYM53C8XX" != "n" ]; then - int ' default tagged command queue depth' CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS 8 - int ' maximum number of queued commands' CONFIG_SCSI_NCR53C8XX_MAX_TAGS 32 - int ' synchronous transfers frequency in MHz' CONFIG_SCSI_NCR53C8XX_SYNC 20 - bool ' use normal IO' CONFIG_SCSI_NCR53C8XX_IOMAPPED + int ' default tagged command queue depth' CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS 8 + int ' maximum number of queued commands' CONFIG_SCSI_NCR53C8XX_MAX_TAGS 32 + int ' synchronous transfers frequency in MHz' CONFIG_SCSI_NCR53C8XX_SYNC 20 + bool ' use normal IO' CONFIG_SCSI_NCR53C8XX_IOMAPPED if [ "$CONFIG_SCSI_SYM53C8XX" != "n" ]; then - bool ' include support for the NCR PQS/PDS SCSI card' CONFIG_SCSI_NCR53C8XX_PQS_PDS + bool ' include support for the NCR PQS/PDS SCSI card' CONFIG_SCSI_NCR53C8XX_PQS_PDS fi if [ "$CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS" = "0" ]; then - bool ' not allow targets to disconnect' CONFIG_SCSI_NCR53C8XX_NO_DISCONNECT + bool ' not allow targets to disconnect' CONFIG_SCSI_NCR53C8XX_NO_DISCONNECT fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - bool ' assume boards are SYMBIOS compatible' CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT + bool ' assume boards are SYMBIOS compatible' CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT fi fi fi if [ "$CONFIG_MCA" = "y" ]; then - dep_tristate 'IBMMCA SCSI support' CONFIG_SCSI_IBMMCA $CONFIG_SCSI + dep_tristate ' IBMMCA SCSI support' CONFIG_SCSI_IBMMCA $CONFIG_SCSI if [ "$CONFIG_SCSI_IBMMCA" != "n" ]; then - bool ' Standard SCSI-order' CONFIG_IBMMCA_SCSI_ORDER_STANDARD - bool ' Reset SCSI-devices at boottime' CONFIG_IBMMCA_SCSI_DEV_RESET + bool ' Standard SCSI-order' CONFIG_IBMMCA_SCSI_ORDER_STANDARD + bool ' Reset SCSI-devices at boottime' CONFIG_IBMMCA_SCSI_DEV_RESET fi fi if [ "$CONFIG_MCA" = "y" ]; then - dep_tristate 'NCR MCA 53C9x SCSI support' CONFIG_SCSI_MCA_53C9X $CONFIG_SCSI + dep_tristate ' NCR MCA 53C9x SCSI support' CONFIG_SCSI_MCA_53C9X $CONFIG_SCSI fi -dep_tristate 'PAS16 SCSI support' CONFIG_SCSI_PAS16 $CONFIG_SCSI -dep_tristate 'PCI2000 support' CONFIG_SCSI_PCI2000 $CONFIG_SCSI -dep_tristate 'PCI2220i support' CONFIG_SCSI_PCI2220I $CONFIG_SCSI -dep_tristate 'PSI240i support' CONFIG_SCSI_PSI240I $CONFIG_SCSI -dep_tristate 'Qlogic FAS SCSI support' CONFIG_SCSI_QLOGIC_FAS $CONFIG_SCSI +dep_tristate ' PAS16 SCSI support' CONFIG_SCSI_PAS16 $CONFIG_SCSI +dep_tristate ' PCI2000 support' CONFIG_SCSI_PCI2000 $CONFIG_SCSI +dep_tristate ' PCI2220i support' CONFIG_SCSI_PCI2220I $CONFIG_SCSI +dep_tristate ' PSI240i support' CONFIG_SCSI_PSI240I $CONFIG_SCSI +dep_tristate ' Qlogic FAS SCSI support' CONFIG_SCSI_QLOGIC_FAS $CONFIG_SCSI if [ "$CONFIG_PCI" = "y" ]; then - dep_tristate 'Qlogic ISP SCSI support' CONFIG_SCSI_QLOGIC_ISP $CONFIG_SCSI - dep_tristate 'Qlogic ISP FC SCSI support' CONFIG_SCSI_QLOGIC_FC $CONFIG_SCSI + dep_tristate ' Qlogic ISP SCSI support' CONFIG_SCSI_QLOGIC_ISP $CONFIG_SCSI + dep_tristate ' Qlogic ISP FC SCSI support' CONFIG_SCSI_QLOGIC_FC $CONFIG_SCSI fi -dep_tristate 'Seagate ST-02 and Future Domain TMC-8xx SCSI support' CONFIG_SCSI_SEAGATE $CONFIG_SCSI +dep_tristate ' Seagate ST-02 and Future Domain TMC-8xx SCSI support' CONFIG_SCSI_SEAGATE $CONFIG_SCSI if [ "$CONFIG_PCI" = "y" ]; then - dep_tristate 'Tekram DC390(T) and Am53/79C974 SCSI support' CONFIG_SCSI_DC390T $CONFIG_SCSI + dep_tristate ' Tekram DC390(T) and Am53/79C974 SCSI support' CONFIG_SCSI_DC390T $CONFIG_SCSI if [ "$CONFIG_SCSI_DC390T" != "n" ]; then - bool ' _omit_ support for non-DC390 adapters' CONFIG_SCSI_DC390T_NOGENSUPP + bool ' _omit_ support for non-DC390 adapters' CONFIG_SCSI_DC390T_NOGENSUPP fi fi -dep_tristate 'Trantor T128/T128F/T228 SCSI support' CONFIG_SCSI_T128 $CONFIG_SCSI -dep_tristate 'UltraStor 14F/34F support' CONFIG_SCSI_U14_34F $CONFIG_SCSI +dep_tristate ' Trantor T128/T128F/T228 SCSI support' CONFIG_SCSI_T128 $CONFIG_SCSI +dep_tristate ' UltraStor 14F/34F support' CONFIG_SCSI_U14_34F $CONFIG_SCSI if [ "$CONFIG_SCSI_U14_34F" != "n" ]; then - bool ' enable elevator sorting' CONFIG_SCSI_U14_34F_LINKED_COMMANDS - int ' maximum number of queued commands' CONFIG_SCSI_U14_34F_MAX_TAGS 8 + bool ' enable elevator sorting' CONFIG_SCSI_U14_34F_LINKED_COMMANDS + int ' maximum number of queued commands' CONFIG_SCSI_U14_34F_MAX_TAGS 8 fi -dep_tristate 'UltraStor SCSI support' CONFIG_SCSI_ULTRASTOR $CONFIG_SCSI +dep_tristate ' UltraStor SCSI support' CONFIG_SCSI_ULTRASTOR $CONFIG_SCSI # # Note - this is a very special 'host' adapter that simulates the presence of some disks. # It can come in very handy for troubleshooting. Anyone else is welcome to use it - all @@ -151,19 +162,23 @@ dep_tristate 'UltraStor SCSI support' CONFIG_SCSI_ULTRASTOR $CONFIG_SCSI # simulate various conditions that I am testing. # if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate 'SCSI debugging host adapter' CONFIG_SCSI_DEBUG $CONFIG_SCSI + dep_tristate ' SCSI debugging host adapter' CONFIG_SCSI_DEBUG $CONFIG_SCSI fi if [ "$CONFIG_PPC" = "y" ]; then - dep_tristate 'MESH (Power Mac internal SCSI) support' CONFIG_SCSI_MESH $CONFIG_SCSI + dep_tristate ' MESH (Power Mac internal SCSI) support' CONFIG_SCSI_MESH $CONFIG_SCSI if [ "$CONFIG_SCSI_MESH" != "n" ]; then - int ' maximum synchronous transfer rate (MB/s) (0 = async)' CONFIG_SCSI_MESH_SYNC_RATE 5 + int ' maximum synchronous transfer rate (MB/s) (0 = async)' CONFIG_SCSI_MESH_SYNC_RATE 5 fi - dep_tristate '53C94 (Power Mac external SCSI) support' CONFIG_SCSI_MAC53C94 $CONFIG_SCSI + dep_tristate ' 53C94 (Power Mac external SCSI) support' CONFIG_SCSI_MAC53C94 $CONFIG_SCSI fi if [ "$CONFIG_ARCH_ACORN" = "y" ]; then source drivers/acorn/scsi/Config.in fi if [ "$CONFIG_MIPS_JAZZ" = "y" ]; then - bool 'MIPS JAZZ FAS216 SCSI support' CONFIG_JAZZ_ESP + bool ' MIPS JAZZ FAS216 SCSI support' CONFIG_JAZZ_ESP +fi +fi +endmenu + fi endmenu diff --git a/drivers/sound/Config.in b/drivers/sound/Config.in index a58192ce8cc1..b5d880bbe749 100644 --- a/drivers/sound/Config.in +++ b/drivers/sound/Config.in @@ -5,316 +5,319 @@ # # See drivers/sound/README.CONFIG for more information. - - # Prompt user for primary drivers. +mainmenu_option next_comment +comment 'Sound card support' +tristate 'Sound card support' CONFIG_SOUND +if [ "$CONFIG_SOUND" != "n" ]; then + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate 'Support for C-Media PCI audio chips (Experimental)' CONFIG_SOUND_CMPCI $CONFIG_SOUND + dep_tristate ' Support for C-Media PCI audio chips (Experimental)' CONFIG_SOUND_CMPCI $CONFIG_SOUND if [ "$CONFIG_SOUND_CMPCI" = "y" -o "$CONFIG_SOUND_CMPCI" = "m" ]; then - bool 'Enable legacy FM' CONFIG_SOUND_CMPCI_FM - bool 'Enable legacy MPU-401' CONFIG_SOUND_CMPCI_MIDI + bool ' Enable legacy FM' CONFIG_SOUND_CMPCI_FM + bool ' Enable legacy MPU-401' CONFIG_SOUND_CMPCI_MIDI fi fi -dep_tristate 'Crystal CS4281' CONFIG_SOUND_CS4281 $CONFIG_SOUND -dep_tristate 'Crystal SoundFusion (CS4280/461x)' CONFIG_SOUND_FUSION $CONFIG_SOUND +dep_tristate ' Crystal CS4281' CONFIG_SOUND_CS4281 $CONFIG_SOUND +dep_tristate ' Crystal SoundFusion (CS4280/461x)' CONFIG_SOUND_FUSION $CONFIG_SOUND if [ "$CONFIG_PCI" = "y" ]; then - dep_tristate 'Creative SBLive! (EMU10K1)' CONFIG_SOUND_EMU10K1 $CONFIG_SOUND + dep_tristate ' Creative SBLive! (EMU10K1)' CONFIG_SOUND_EMU10K1 $CONFIG_SOUND fi -dep_tristate 'Ensoniq AudioPCI (ES1370)' CONFIG_SOUND_ES1370 $CONFIG_SOUND +dep_tristate ' Ensoniq AudioPCI (ES1370)' CONFIG_SOUND_ES1370 $CONFIG_SOUND if [ "$CONFIG_SOUND_ES1370" = "y" ]; then - bool 'Joystick support at boot time' CONFIG_SOUND_ES1370_JOYPORT_BOOT + bool ' Joystick support at boot time' CONFIG_SOUND_ES1370_JOYPORT_BOOT fi -dep_tristate 'Creative Ensoniq AudioPCI 97 (ES1371)' CONFIG_SOUND_ES1371 $CONFIG_SOUND +dep_tristate ' Creative Ensoniq AudioPCI 97 (ES1371)' CONFIG_SOUND_ES1371 $CONFIG_SOUND if [ "$CONFIG_SOUND_ES1371" = "y" ]; then - bool 'Joystick support at boot time' CONFIG_SOUND_ES1371_JOYPORT_BOOT + bool ' Joystick support at boot time' CONFIG_SOUND_ES1371_JOYPORT_BOOT if [ "$CONFIG_SOUND_ES1371_JOYPORT_BOOT" = "y" ]; then - hex 'Gameport I/O 200,208,210,218' CONFIG_SOUND_ES1371_GAMEPORT 200 + hex ' Gameport I/O 200,208,210,218' CONFIG_SOUND_ES1371_GAMEPORT 200 fi fi -dep_tristate 'ESS Maestro' CONFIG_SOUND_MAESTRO $CONFIG_SOUND -dep_tristate 'ESS Maestro3' CONFIG_SOUND_MAESTRO3 $CONFIG_SOUND -dep_tristate 'ESS Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND +dep_tristate ' ESS Maestro' CONFIG_SOUND_MAESTRO $CONFIG_SOUND +dep_tristate ' ESS Maestro3' CONFIG_SOUND_MAESTRO3 $CONFIG_SOUND +dep_tristate ' ESS Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND -dep_tristate 'Intel ICH (810, 820, 440MX...)' CONFIG_SOUND_ICH $CONFIG_SOUND +dep_tristate ' Intel ICH (810, 820, 440MX...)' CONFIG_SOUND_ICH $CONFIG_SOUND -dep_tristate 'S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND +dep_tristate ' S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND if [ "$CONFIG_VISWS" = "y" ]; then - dep_tristate ' Workstation Sound' CONFIG_SOUND_VWSND $CONFIG_SOUND + dep_tristate ' Workstation Sound' CONFIG_SOUND_VWSND $CONFIG_SOUND fi -dep_tristate 'Trident 4DWave DX/NX or SiS 7018 PCI Audio Core or ALi 5451' CONFIG_SOUND_TRIDENT $CONFIG_SOUND +dep_tristate ' Trident 4DWave DX/NX or SiS 7018 PCI Audio Core or ALi 5451' CONFIG_SOUND_TRIDENT $CONFIG_SOUND -dep_tristate 'Support for Turtle Beach MultiSound Classic, Tahiti, Monterey' CONFIG_SOUND_MSNDCLAS $CONFIG_SOUND +dep_tristate ' Support for Turtle Beach MultiSound Classic, Tahiti, Monterey' CONFIG_SOUND_MSNDCLAS $CONFIG_SOUND if [ "$CONFIG_SOUND_MSNDCLAS" = "y" -o "$CONFIG_SOUND_MSNDCLAS" = "m" ]; then if [ "$CONFIG_SOUND_MSNDCLAS" = "y" ]; then - comment 'Compiled-in MSND Classic support requires firmware during compilation.' + comment ' Compiled-in MSND Classic support requires firmware during compilation.' define_bool CONFIG_MSNDCLAS_HAVE_BOOT y else define_bool CONFIG_MSNDCLAS_HAVE_BOOT n fi - string ' Full pathname of MSNDINIT.BIN firmware file' CONFIG_MSNDCLAS_INIT_FILE "/etc/sound/msndinit.bin" - string ' Full pathname of MSNDPERM.BIN firmware file' CONFIG_MSNDCLAS_PERM_FILE "/etc/sound/msndperm.bin" + string ' Full pathname of MSNDINIT.BIN firmware file' CONFIG_MSNDCLAS_INIT_FILE "/etc/sound/msndinit.bin" + string ' Full pathname of MSNDPERM.BIN firmware file' CONFIG_MSNDCLAS_PERM_FILE "/etc/sound/msndperm.bin" fi if [ "$CONFIG_SOUND_MSNDCLAS" = "y" ]; then - int 'MSND Classic IRQ 5,7,9,10,11,12' CONFIG_MSNDCLAS_IRQ 5 - hex 'MSND Classic memory B0000,C8000,D0000,D8000,E0000,E8000' CONFIG_MSNDCLAS_MEM D0000 - hex 'MSND Classic I/O 210,220,230,240,250,260,290,3E0' CONFIG_MSNDCLAS_IO 290 + int ' MSND Classic IRQ 5,7,9,10,11,12' CONFIG_MSNDCLAS_IRQ 5 + hex ' MSND Classic memory B0000,C8000,D0000,D8000,E0000,E8000' CONFIG_MSNDCLAS_MEM D0000 + hex ' MSND Classic I/O 210,220,230,240,250,260,290,3E0' CONFIG_MSNDCLAS_IO 290 fi -dep_tristate 'Support for Turtle Beach MultiSound Pinnacle, Fiji' CONFIG_SOUND_MSNDPIN $CONFIG_SOUND +dep_tristate ' Support for Turtle Beach MultiSound Pinnacle, Fiji' CONFIG_SOUND_MSNDPIN $CONFIG_SOUND if [ "$CONFIG_SOUND_MSNDPIN" = "y" -o "$CONFIG_SOUND_MSNDPIN" = "m" ]; then if [ "$CONFIG_SOUND_MSNDPIN" = "y" ]; then - comment 'Compiled-in MSND Pinnacle support requires firmware during compilation.' + comment ' Compiled-in MSND Pinnacle support requires firmware during compilation.' define_bool CONFIG_MSNDPIN_HAVE_BOOT y else define_bool CONFIG_MSNDPIN_HAVE_BOOT n fi - string ' Full pathname of PNDSPINI.BIN firmware file' CONFIG_MSNDPIN_INIT_FILE "/etc/sound/pndspini.bin" - string ' Full pathname of PNDSPERM.BIN firmware file' CONFIG_MSNDPIN_PERM_FILE "/etc/sound/pndsperm.bin" + string ' Full pathname of PNDSPINI.BIN firmware file' CONFIG_MSNDPIN_INIT_FILE "/etc/sound/pndspini.bin" + string ' Full pathname of PNDSPERM.BIN firmware file' CONFIG_MSNDPIN_PERM_FILE "/etc/sound/pndsperm.bin" fi if [ "$CONFIG_SOUND_MSNDPIN" = "y" ]; then - int 'MSND Pinnacle IRQ 5,7,9,10,11,12' CONFIG_MSNDPIN_IRQ 5 - hex 'MSND Pinnacle memory B0000,C8000,D0000,D8000,E0000,E8000' CONFIG_MSNDPIN_MEM D0000 - hex 'MSND Pinnacle I/O 210,220,230,240,250,260,290,3E0' CONFIG_MSNDPIN_IO 290 - bool 'MSND Pinnacle has S/PDIF I/O' CONFIG_MSNDPIN_DIGITAL - bool 'MSND Pinnacle non-PnP Mode' CONFIG_MSNDPIN_NONPNP + int ' MSND Pinnacle IRQ 5,7,9,10,11,12' CONFIG_MSNDPIN_IRQ 5 + hex ' MSND Pinnacle memory B0000,C8000,D0000,D8000,E0000,E8000' CONFIG_MSNDPIN_MEM D0000 + hex ' MSND Pinnacle I/O 210,220,230,240,250,260,290,3E0' CONFIG_MSNDPIN_IO 290 + bool ' MSND Pinnacle has S/PDIF I/O' CONFIG_MSNDPIN_DIGITAL + bool ' MSND Pinnacle non-PnP Mode' CONFIG_MSNDPIN_NONPNP if [ "$CONFIG_MSNDPIN_NONPNP" = "y" ]; then - comment 'MSND Pinnacle DSP section will be configured to above parameters.' - hex 'MSND Pinnacle config port 250,260,270' CONFIG_MSNDPIN_CFG 250 - comment 'Pinnacle-specific Device Configuration (0 disables)' - hex 'MSND Pinnacle MPU I/O (e.g. 330)' CONFIG_MSNDPIN_MPU_IO 0 - int 'MSND Pinnacle MPU IRQ (e.g. 9)' CONFIG_MSNDPIN_MPU_IRQ 0 - hex 'MSND Pinnacle IDE I/O 0 (e.g. 170)' CONFIG_MSNDPIN_IDE_IO0 0 - hex 'MSND Pinnacle IDE I/O 1 (e.g. 376)' CONFIG_MSNDPIN_IDE_IO1 0 - int 'MSND Pinnacle IDE IRQ (e.g. 15)' CONFIG_MSNDPIN_IDE_IRQ 0 - hex 'MSND Pinnacle joystick I/O (e.g. 200)' CONFIG_MSNDPIN_JOYSTICK_IO 0 + comment ' MSND Pinnacle DSP section will be configured to above parameters.' + hex ' MSND Pinnacle config port 250,260,270' CONFIG_MSNDPIN_CFG 250 + comment ' Pinnacle-specific Device Configuration (0 disables)' + hex ' MSND Pinnacle MPU I/O (e.g. 330)' CONFIG_MSNDPIN_MPU_IO 0 + int ' MSND Pinnacle MPU IRQ (e.g. 9)' CONFIG_MSNDPIN_MPU_IRQ 0 + hex ' MSND Pinnacle IDE I/O 0 (e.g. 170)' CONFIG_MSNDPIN_IDE_IO0 0 + hex ' MSND Pinnacle IDE I/O 1 (e.g. 376)' CONFIG_MSNDPIN_IDE_IO1 0 + int ' MSND Pinnacle IDE IRQ (e.g. 15)' CONFIG_MSNDPIN_IDE_IRQ 0 + hex ' MSND Pinnacle joystick I/O (e.g. 200)' CONFIG_MSNDPIN_JOYSTICK_IO 0 fi fi if [ "$CONFIG_SOUND_MSNDPIN" = "y" -o "$CONFIG_SOUND_MSNDCLAS" = "y" ]; then - int 'MSND buffer size (kB)' CONFIG_MSND_FIFOSIZE 128 + int ' MSND buffer size (kB)' CONFIG_MSND_FIFOSIZE 128 fi -dep_tristate 'VIA 82C686 Audio Codec' CONFIG_SOUND_VIA82CXXX $CONFIG_SOUND +dep_tristate ' VIA 82C686 Audio Codec' CONFIG_SOUND_VIA82CXXX $CONFIG_SOUND -dep_tristate 'OSS sound modules' CONFIG_SOUND_OSS $CONFIG_SOUND +dep_tristate ' OSS sound modules' CONFIG_SOUND_OSS $CONFIG_SOUND if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND_OSS" = "m" ]; then if [ "$CONFIG_SOUND_OSS" = "y" ]; then - bool 'Persistent DMA buffers' CONFIG_SOUND_DMAP + bool ' Persistent DMA buffers' CONFIG_SOUND_DMAP fi - dep_tristate 'ProAudioSpectrum 16 support' CONFIG_SOUND_PAS $CONFIG_SOUND_OSS + dep_tristate ' ProAudioSpectrum 16 support' CONFIG_SOUND_PAS $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_PAS" = "y" ]; then - int 'PAS16 IRQ 3, 4, 5, 7, 9, 10, 11, 12, 14 or 15' CONFIG_PAS_IRQ 10 - int 'PAS16 DMA 0, 1, 3, 5, 6 or 7' CONFIG_PAS_DMA 3 - bool 'Enable PAS16 joystick port' CONFIG_PAS_JOYSTICK + int ' PAS16 IRQ 3, 4, 5, 7, 9, 10, 11, 12, 14 or 15' CONFIG_PAS_IRQ 10 + int ' PAS16 DMA 0, 1, 3, 5, 6 or 7' CONFIG_PAS_DMA 3 + bool ' Enable PAS16 joystick port' CONFIG_PAS_JOYSTICK fi - dep_tristate '100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support' CONFIG_SOUND_SB $CONFIG_SOUND_OSS + dep_tristate ' 100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support' CONFIG_SOUND_SB $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_SB" = "y" ]; then - hex 'I/O base for SB Check from manual of the card' CONFIG_SB_BASE 220 - int 'Sound Blaster IRQ Check from manual of the card' CONFIG_SB_IRQ 7 - int 'Sound Blaster DMA 0, 1 or 3' CONFIG_SB_DMA 1 - int 'Sound Blaster 16 bit DMA (SB16, Jazz16, SMW) 5, 6 or 7 (use 1 for 8 bit cards)' CONFIG_SB_DMA2 5 - hex 'MPU401 I/O base of SB16, Jazz16 and ES1688 Check from manual of the card' CONFIG_SB_MPU_BASE 330 - comment 'MPU401 IRQ is only required with Jazz16, SM Wave and ESS1688.' - comment 'Enter -1 to the following question if you have something else such as SB16/32.' - int 'SB MPU401 IRQ (Jazz16, SM Wave and ES1688) Check from manual of the card' CONFIG_SB_MPU_IRQ -1 + hex ' I/O base for SB Check from manual of the card' CONFIG_SB_BASE 220 + int ' Sound Blaster IRQ Check from manual of the card' CONFIG_SB_IRQ 7 + int ' Sound Blaster DMA 0, 1 or 3' CONFIG_SB_DMA 1 + int ' Sound Blaster 16 bit DMA (SB16, Jazz16, SMW) 5, 6 or 7 (use 1 for 8 bit cards)' CONFIG_SB_DMA2 5 + hex ' MPU401 I/O base of SB16, Jazz16 and ES1688 Check from manual of the card' CONFIG_SB_MPU_BASE 330 + comment ' MPU401 IRQ is only required with Jazz16, SM Wave and ESS1688.' + comment ' Enter -1 to the following question if you have something else such as SB16/32.' + int ' SB MPU401 IRQ (Jazz16, SM Wave and ES1688) Check from manual of the card' CONFIG_SB_MPU_IRQ -1 fi - dep_tristate 'Gravis Ultrasound support' CONFIG_SOUND_GUS $CONFIG_SOUND_OSS + dep_tristate ' Gravis Ultrasound support' CONFIG_SOUND_GUS $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_GUS" = "y" -o "$CONFIG_SOUND_GUS" = "m" ]; then - bool '16 bit sampling option of GUS (_NOT_ GUS MAX)' CONFIG_GUS16 - bool 'GUS MAX support' CONFIG_GUSMAX + bool ' 16 bit sampling option of GUS (_NOT_ GUS MAX)' CONFIG_GUS16 + bool ' GUS MAX support' CONFIG_GUSMAX fi if [ "$CONFIG_SOUND_GUS" = "y" ]; then - hex 'I/O base for GUS 210, 220, 230, 240, 250 or 260' CONFIG_GUS_BASE 220 - int 'GUS IRQ 3, 5, 7, 9, 11, 12 or 15' CONFIG_GUS_IRQ 15 - int 'GUS DMA 1, 3, 5, 6 or 7' CONFIG_GUS_DMA 6 - int 'Second DMA channel for GUS 1, 3, 5, 6 or 7' CONFIG_GUS_DMA2 -1 + hex ' I/O base for GUS 210, 220, 230, 240, 250 or 260' CONFIG_GUS_BASE 220 + int ' GUS IRQ 3, 5, 7, 9, 11, 12 or 15' CONFIG_GUS_IRQ 15 + int ' GUS DMA 1, 3, 5, 6 or 7' CONFIG_GUS_DMA 6 + int ' Second DMA channel for GUS 1, 3, 5, 6 or 7' CONFIG_GUS_DMA2 -1 if [ "$CONFIG_GUS16" = "y" ]; then - hex 'I/O base for the 16 bit daughtercard of GUS 530, 604, E80 or F40' CONFIG_GUS16_BASE 530 - int 'GUS 16 bit daughtercard IRQ 3, 4, 5, 7, or 9' CONFIG_GUS16_IRQ 7 - int 'GUS DMA 0, 1 or 3' CONFIG_GUS16_DMA 3 + hex ' I/O base for the 16 bit daughtercard of GUS 530, 604, E80 or F40' CONFIG_GUS16_BASE 530 + int ' GUS 16 bit daughtercard IRQ 3, 4, 5, 7, or 9' CONFIG_GUS16_IRQ 7 + int ' GUS DMA 0, 1 or 3' CONFIG_GUS16_DMA 3 fi fi - dep_tristate 'MPU-401 support (NOT for SB16)' CONFIG_SOUND_MPU401 $CONFIG_SOUND_OSS + dep_tristate ' MPU-401 support (NOT for SB16)' CONFIG_SOUND_MPU401 $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_MPU401" = "y" ]; then - hex 'I/O base for MPU401 Check from manual of the card' CONFIG_MPU_BASE 330 - int 'MPU401 IRQ Check from manual of the card' CONFIG_MPU_IRQ 9 + hex ' I/O base for MPU401 Check from manual of the card' CONFIG_MPU_BASE 330 + int ' MPU401 IRQ Check from manual of the card' CONFIG_MPU_IRQ 9 fi - dep_tristate 'PSS (AD1848, ADSP-2115, ESC614) support' CONFIG_SOUND_PSS $CONFIG_SOUND_OSS + dep_tristate ' PSS (AD1848, ADSP-2115, ESC614) support' CONFIG_SOUND_PSS $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_PSS" = "y" ]; then - hex 'PSS I/O base 220 or 240' CONFIG_PSS_BASE 220 - hex 'PSS audio I/O base 530, 604, E80 or F40' CONFIG_PSS_MSS_BASE 530 - int 'PSS audio IRQ 7, 9, 10 or 11' CONFIG_PSS_MSS_IRQ 11 - int 'PSS audio DMA 0, 1 or 3' CONFIG_PSS_MSS_DMA 3 - hex 'PSS MIDI I/O base ' CONFIG_PSS_MPU_BASE 330 - int 'PSS MIDI IRQ 3, 4, 5, 7, 9, 10, 11, 12' CONFIG_PSS_MPU_IRQ 9 - bool ' Have DSPxxx.LD firmware file' CONFIG_PSS_HAVE_BOOT + hex ' PSS I/O base 220 or 240' CONFIG_PSS_BASE 220 + hex ' PSS audio I/O base 530, 604, E80 or F40' CONFIG_PSS_MSS_BASE 530 + int ' PSS audio IRQ 7, 9, 10 or 11' CONFIG_PSS_MSS_IRQ 11 + int ' PSS audio DMA 0, 1 or 3' CONFIG_PSS_MSS_DMA 3 + hex ' PSS MIDI I/O base ' CONFIG_PSS_MPU_BASE 330 + int ' PSS MIDI IRQ 3, 4, 5, 7, 9, 10, 11, 12' CONFIG_PSS_MPU_IRQ 9 + bool ' Have DSPxxx.LD firmware file' CONFIG_PSS_HAVE_BOOT if [ "$CONFIG_PSS_HAVE_BOOT" = "y" ]; then - string ' Full pathname of DSPxxx.LD firmware file' CONFIG_PSS_BOOT_FILE /etc/sound/dsp001.ld + string ' Full pathname of DSPxxx.LD firmware file' CONFIG_PSS_BOOT_FILE /etc/sound/dsp001.ld fi fi if [ "$CONFIG_SOUND_PSS" = "y" -o "$CONFIG_SOUND_PSS" = "m" ]; then - bool ' Enable PSS mixer (Beethoven ADSP-16 and other compatibile)' CONFIG_PSS_MIXER + bool ' Enable PSS mixer (Beethoven ADSP-16 and other compatibile)' CONFIG_PSS_MIXER fi - dep_tristate 'Microsoft Sound System support' CONFIG_SOUND_MSS $CONFIG_SOUND_OSS + dep_tristate ' Microsoft Sound System support' CONFIG_SOUND_MSS $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_MSS" = "y" ]; then - bool ' Enable support for the SoundPro mixer' CONFIG_SOUND_SPRO - hex 'MSS/WSS I/O base 530, 604, E80 or F40' CONFIG_MSS_BASE 530 - int 'MSS/WSS IRQ 7, 9, 10 or 11' CONFIG_MSS_IRQ 11 - int 'MSS/WSS DMA 0, 1 or 3' CONFIG_MSS_DMA 3 - int 'MSS/WSS second DMA (if possible) 0, 1 or 3' CONFIG_MSS_DMA2 -1 + bool ' Enable support for the SoundPro mixer' CONFIG_SOUND_SPRO + hex ' MSS/WSS I/O base 530, 604, E80 or F40' CONFIG_MSS_BASE 530 + int ' MSS/WSS IRQ 7, 9, 10 or 11' CONFIG_MSS_IRQ 11 + int ' MSS/WSS DMA 0, 1 or 3' CONFIG_MSS_DMA 3 + int ' MSS/WSS second DMA (if possible) 0, 1 or 3' CONFIG_MSS_DMA2 -1 fi - dep_tristate 'Ensoniq SoundScape support' CONFIG_SOUND_SSCAPE $CONFIG_SOUND_OSS + dep_tristate ' Ensoniq SoundScape support' CONFIG_SOUND_SSCAPE $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_SSCAPE" = "y" ]; then - hex 'SoundScape MIDI I/O base 320, 330, 340 or 350' CONFIG_SSCAPE_BASE 330 - int 'SoundScape MIDI IRQ ' CONFIG_SSCAPE_IRQ 9 - int 'SoundScape initialization DMA 0, 1 or 3' CONFIG_SSCAPE_DMA 3 - hex 'SoundScape audio I/O base 534, 608, E84 or F44' CONFIG_SSCAPE_MSS_BASE 534 - int 'SoundScape audio IRQ 7, 9, 10 or 11' CONFIG_SSCAPE_MSS_IRQ 11 + hex ' SoundScape MIDI I/O base 320, 330, 340 or 350' CONFIG_SSCAPE_BASE 330 + int ' SoundScape MIDI IRQ ' CONFIG_SSCAPE_IRQ 9 + int ' SoundScape initialization DMA 0, 1 or 3' CONFIG_SSCAPE_DMA 3 + hex ' SoundScape audio I/O base 534, 608, E84 or F44' CONFIG_SSCAPE_MSS_BASE 534 + int ' SoundScape audio IRQ 7, 9, 10 or 11' CONFIG_SSCAPE_MSS_IRQ 11 fi - dep_tristate 'MediaTrix AudioTrix Pro support' CONFIG_SOUND_TRIX $CONFIG_SOUND_OSS + dep_tristate ' MediaTrix AudioTrix Pro support' CONFIG_SOUND_TRIX $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_TRIX" = "y" ]; then - hex 'TRIX audio I/O base 530, 604, E80 or F40' CONFIG_TRIX_BASE 530 - int 'TRIX audio IRQ 7, 9, 10 or 11' CONFIG_TRIX_IRQ 11 - int 'TRIX audio DMA 0, 1 or 3' CONFIG_TRIX_DMA 0 - int 'TRIX second (duplex) DMA 0, 1 or 3' CONFIG_TRIX_DMA2 3 - hex 'TRIX MIDI I/O base 330, 370, 3B0 or 3F0' CONFIG_TRIX_MPU_BASE 330 - int 'TRIX MIDI IRQ 3, 4, 5, 7 or 9' CONFIG_TRIX_MPU_IRQ 9 - hex 'TRIX SB I/O base 220, 210, 230, 240, 250, 260 or 270' CONFIG_TRIX_SB_BASE 220 - int 'TRIX SB IRQ 3, 4, 5 or 7' CONFIG_TRIX_SB_IRQ 7 - int 'TRIX SB DMA 1 or 3' CONFIG_TRIX_SB_DMA 1 - bool ' Have TRXPRO.HEX firmware file' CONFIG_TRIX_HAVE_BOOT + hex ' TRIX audio I/O base 530, 604, E80 or F40' CONFIG_TRIX_BASE 530 + int ' TRIX audio IRQ 7, 9, 10 or 11' CONFIG_TRIX_IRQ 11 + int ' TRIX audio DMA 0, 1 or 3' CONFIG_TRIX_DMA 0 + int ' TRIX second (duplex) DMA 0, 1 or 3' CONFIG_TRIX_DMA2 3 + hex ' TRIX MIDI I/O base 330, 370, 3B0 or 3F0' CONFIG_TRIX_MPU_BASE 330 + int ' TRIX MIDI IRQ 3, 4, 5, 7 or 9' CONFIG_TRIX_MPU_IRQ 9 + hex ' TRIX SB I/O base 220, 210, 230, 240, 250, 260 or 270' CONFIG_TRIX_SB_BASE 220 + int ' TRIX SB IRQ 3, 4, 5 or 7' CONFIG_TRIX_SB_IRQ 7 + int ' TRIX SB DMA 1 or 3' CONFIG_TRIX_SB_DMA 1 + bool ' Have TRXPRO.HEX firmware file' CONFIG_TRIX_HAVE_BOOT if [ "$CONFIG_TRIX_HAVE_BOOT" = "y" ]; then - string ' Full pathname of TRXPRO.HEX firmware file' CONFIG_TRIX_BOOT_FILE /etc/sound/trxpro.hex + string ' Full pathname of TRXPRO.HEX firmware file' CONFIG_TRIX_BOOT_FILE /etc/sound/trxpro.hex fi fi - dep_tristate 'Support for OPTi MAD16 and/or Mozart based cards' CONFIG_SOUND_MAD16 $CONFIG_SOUND_OSS + dep_tristate ' Support for OPTi MAD16 and/or Mozart based cards' CONFIG_SOUND_MAD16 $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_MAD16" = "y" -o "$CONFIG_SOUND_MAD16" = "m" ]; then - bool 'Support MIDI in older MAD16 based cards (requires SB)' CONFIG_MAD16_OLDCARD + bool ' Support MIDI in older MAD16 based cards (requires SB)' CONFIG_MAD16_OLDCARD fi if [ "$CONFIG_SOUND_MAD16" = "y" ]; then - hex 'MAD16 audio I/O base 530, 604, E80 or F40' CONFIG_MAD16_BASE 530 - int 'MAD16 audio IRQ 7, 9, 10 or 11' CONFIG_MAD16_IRQ 11 - int 'MAD16 audio DMA 0, 1 or 3' CONFIG_MAD16_DMA 3 - int 'MAD16 second (duplex) DMA 0, 1 or 3' CONFIG_MAD16_DMA2 0 - hex 'MAD16 MIDI I/O base 300, 310, 320 or 330 (0 disables)' CONFIG_MAD16_MPU_BASE 330 - int 'MAD16 MIDI IRQ 5, 7, 9 or 10' CONFIG_MAD16_MPU_IRQ 9 + hex ' MAD16 audio I/O base 530, 604, E80 or F40' CONFIG_MAD16_BASE 530 + int ' MAD16 audio IRQ 7, 9, 10 or 11' CONFIG_MAD16_IRQ 11 + int ' MAD16 audio DMA 0, 1 or 3' CONFIG_MAD16_DMA 3 + int ' MAD16 second (duplex) DMA 0, 1 or 3' CONFIG_MAD16_DMA2 0 + hex ' MAD16 MIDI I/O base 300, 310, 320 or 330 (0 disables)' CONFIG_MAD16_MPU_BASE 330 + int ' MAD16 MIDI IRQ 5, 7, 9 or 10' CONFIG_MAD16_MPU_IRQ 9 fi - dep_tristate 'Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards' CONFIG_SOUND_WAVEFRONT $CONFIG_SOUND_OSS m + dep_tristate ' Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards' CONFIG_SOUND_WAVEFRONT $CONFIG_SOUND_OSS m if [ "$CONFIG_SOUND_WAVEFRONT" = "y" ]; then - hex 'I/O base for WaveFront 210, 230, 260, 290, 300, 320, 338 or 330' CONFIG_WAVEFRONT_BASE 330 - int 'WaveFront IRQ 5, 9, 12 or 15' CONFIG_WAVEFRONT_IRQ 9 + hex ' I/O base for WaveFront 210, 230, 260, 290, 300, 320, 338 or 330' CONFIG_WAVEFRONT_BASE 330 + int ' WaveFront IRQ 5, 9, 12 or 15' CONFIG_WAVEFRONT_IRQ 9 fi - dep_tristate 'Support for Crystal CS4232 based (PnP) cards' CONFIG_SOUND_CS4232 $CONFIG_SOUND_OSS + dep_tristate ' Support for Crystal CS4232 based (PnP) cards' CONFIG_SOUND_CS4232 $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_CS4232" = "y" ]; then - hex 'CS4232 audio I/O base (normally 530, 604, E80 or F40)' CONFIG_CS4232_BASE 530 - int 'CS4232 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_CS4232_IRQ 11 - int 'CS4232 audio DMA 0, 1 or 3' CONFIG_CS4232_DMA 0 - int 'CS4232 second (duplex) DMA 0, 1 or 3' CONFIG_CS4232_DMA2 3 - hex 'CS4232 MIDI I/O base 330, 370, 3B0 or 3F0' CONFIG_CS4232_MPU_BASE 330 - int 'CS4232 MIDI IRQ 5, 7, 9, 11, 12 or 15' CONFIG_CS4232_MPU_IRQ 9 + hex ' CS4232 audio I/O base (normally 530, 604, E80 or F40)' CONFIG_CS4232_BASE 530 + int ' CS4232 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_CS4232_IRQ 11 + int ' CS4232 audio DMA 0, 1 or 3' CONFIG_CS4232_DMA 0 + int ' CS4232 second (duplex) DMA 0, 1 or 3' CONFIG_CS4232_DMA2 3 + hex ' CS4232 MIDI I/O base 330, 370, 3B0 or 3F0' CONFIG_CS4232_MPU_BASE 330 + int ' CS4232 MIDI IRQ 5, 7, 9, 11, 12 or 15' CONFIG_CS4232_MPU_IRQ 9 fi - dep_tristate 'Support for Yamaha OPL3-SA2, SA3, and SAx based PnP cards' CONFIG_SOUND_OPL3SA2 $CONFIG_SOUND_OSS + dep_tristate ' Support for Yamaha OPL3-SA2, SA3, and SAx based PnP cards' CONFIG_SOUND_OPL3SA2 $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_OPL3SA2" = "y" ]; then - int 'Chipset (-1 for autoprobe, 2, or 3)' CONFIG_OPL3SA2_CHIPSET -1 - hex 'OPL3SA2 audio I/O base (530 - F48 valid)' CONFIG_OPL3SA2_BASE 530 - int 'OPL3SA2 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_OPL3SA2_IRQ 9 - int 'OPL3SA2 audio DMA 0, 1 or 3' CONFIG_OPL3SA2_DMA 0 - int 'OPL3SA2 second (duplex) DMA 0, 1 or 3' CONFIG_OPL3SA2_DMA2 1 - hex 'OPL3SA2 control I/O base (100 - FFE valid)' CONFIG_OPL3SA2_CTRL_BASE 370 - hex 'OPL3SA2 MIDI I/O base (300 - 334 valid)' CONFIG_OPL3SA2_MPU_BASE 330 - int 'OPL3SA2 MIDI IRQ 5, 7, 9, 11, 12 or 15' CONFIG_OPL3SA2_MPU_IRQ 9 + int ' Chipset (-1 for autoprobe, 2, or 3)' CONFIG_OPL3SA2_CHIPSET -1 + hex ' OPL3SA2 audio I/O base (530 - F48 valid)' CONFIG_OPL3SA2_BASE 530 + int ' OPL3SA2 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_OPL3SA2_IRQ 9 + int ' OPL3SA2 audio DMA 0, 1 or 3' CONFIG_OPL3SA2_DMA 0 + int ' OPL3SA2 second (duplex) DMA 0, 1 or 3' CONFIG_OPL3SA2_DMA2 1 + hex ' OPL3SA2 control I/O base (100 - FFE valid)' CONFIG_OPL3SA2_CTRL_BASE 370 + hex ' OPL3SA2 MIDI I/O base (300 - 334 valid)' CONFIG_OPL3SA2_MPU_BASE 330 + int ' OPL3SA2 MIDI IRQ 5, 7, 9, 11, 12 or 15' CONFIG_OPL3SA2_MPU_IRQ 9 fi - dep_tristate 'Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers' CONFIG_SOUND_MAUI $CONFIG_SOUND_OSS + dep_tristate ' Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers' CONFIG_SOUND_MAUI $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_MAUI" = "y" ]; then - hex 'I/O base for Maui 210, 230, 260, 290, 300, 320, 338 or 330' CONFIG_MAUI_BASE 330 - int 'Maui IRQ 5, 9, 12 or 15' CONFIG_MAUI_IRQ 9 - bool ' Have OSWF.MOT firmware file' CONFIG_MAUI_HAVE_BOOT + hex ' I/O base for Maui 210, 230, 260, 290, 300, 320, 338 or 330' CONFIG_MAUI_BASE 330 + int ' Maui IRQ 5, 9, 12 or 15' CONFIG_MAUI_IRQ 9 + bool ' Have OSWF.MOT firmware file' CONFIG_MAUI_HAVE_BOOT if [ "$CONFIG_MAUI_HAVE_BOOT" = "y" ]; then - string ' Full pathname of OSWF.MOT firmware file' CONFIG_MAUI_BOOT_FILE /etc/sound/oswf.mot + string ' Full pathname of OSWF.MOT firmware file' CONFIG_MAUI_BOOT_FILE /etc/sound/oswf.mot fi fi - dep_tristate 'Support for Aztech Sound Galaxy (non-PnP) cards' CONFIG_SOUND_SGALAXY $CONFIG_SOUND_OSS + dep_tristate ' Support for Aztech Sound Galaxy (non-PnP) cards' CONFIG_SOUND_SGALAXY $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_SGALAXY" = "y" ]; then - hex 'SGALAXY audio I/O base 530, 604, E80 or F40' CONFIG_SGALAXY_BASE 530 - int 'SGALAXY audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_SGALAXY_IRQ 11 - int 'SGALAXY audio DMA 0, 1 or 3' CONFIG_SGALAXY_DMA 0 - int 'SGALAXY second (duplex) DMA 0, 1 or 3' CONFIG_SGALAXY_DMA2 3 - hex 'SGALAXY SB I/O base 220 or 240' CONFIG_SGALAXY_SGBASE 220 + hex ' SGALAXY audio I/O base 530, 604, E80 or F40' CONFIG_SGALAXY_BASE 530 + int ' SGALAXY audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_SGALAXY_IRQ 11 + int ' SGALAXY audio DMA 0, 1 or 3' CONFIG_SGALAXY_DMA 0 + int ' SGALAXY second (duplex) DMA 0, 1 or 3' CONFIG_SGALAXY_DMA2 3 + hex ' SGALAXY SB I/O base 220 or 240' CONFIG_SGALAXY_SGBASE 220 fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate 'Support for AD1816(A) based cards (EXPERIMENTAL)' CONFIG_SOUND_AD1816 $CONFIG_SOUND_OSS + dep_tristate ' Support for AD1816(A) based cards (EXPERIMENTAL)' CONFIG_SOUND_AD1816 $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_AD1816" = "y" ]; then - hex 'AD1816 audio I/O base 530, 604, E80 or F40' CONFIG_AD1816_BASE 530 - int 'AD1816 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_AD1816_IRQ 7 - int 'AD1816 audio DMA 0, 1 or 3' CONFIG_AD1816_DMA 0 - int 'AD1816 second (duplex) DMA 0, 1 or 3' CONFIG_AD1816_DMA2 3 - int 'AD1816 clock chip frequency' CONFIG_AD1816_CLOCK 33000 + hex ' AD1816 audio I/O base 530, 604, E80 or F40' CONFIG_AD1816_BASE 530 + int ' AD1816 audio IRQ 5, 7, 9, 11, 12 or 15' CONFIG_AD1816_IRQ 7 + int ' AD1816 audio DMA 0, 1 or 3' CONFIG_AD1816_DMA 0 + int ' AD1816 second (duplex) DMA 0, 1 or 3' CONFIG_AD1816_DMA2 3 + int ' AD1816 clock chip frequency' CONFIG_AD1816_CLOCK 33000 fi fi - dep_tristate 'Yamaha OPL3-SA1 audio controller' CONFIG_SOUND_OPL3SA1 $CONFIG_SOUND_OSS + dep_tristate ' Yamaha OPL3-SA1 audio controller' CONFIG_SOUND_OPL3SA1 $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_OPL3SA1" = "y" ]; then - hex 'OPL3-SA1 audio I/O base 530, 604, E80 or F40' CONFIG_OPL3SA1_BASE 530 - int 'OPL3-SA1 audio IRQ 7, 9, 10 or 11' CONFIG_OPL3SA1_IRQ 11 - int 'OPL3-SA1 audio DMA 0, 1 or 3' CONFIG_OPL3SA1_DMA 0 - int 'OPL3-SA1 second (duplex) DMA 0, 1 or 3' CONFIG_OPL3SA1_DMA2 3 - hex 'OPL3-SA1 MIDI I/O base 330, 370, 3B0 or 3F0' CONFIG_OPL3SA1_MPU_BASE 330 - int 'OPL3-SA1 MIDI IRQ 3, 4, 5, 7 or 9' CONFIG_OPL3SA1_MPU_IRQ 9 + hex ' OPL3-SA1 audio I/O base 530, 604, E80 or F40' CONFIG_OPL3SA1_BASE 530 + int ' OPL3-SA1 audio IRQ 7, 9, 10 or 11' CONFIG_OPL3SA1_IRQ 11 + int ' OPL3-SA1 audio DMA 0, 1 or 3' CONFIG_OPL3SA1_DMA 0 + int ' OPL3-SA1 second (duplex) DMA 0, 1 or 3' CONFIG_OPL3SA1_DMA2 3 + hex ' OPL3-SA1 MIDI I/O base 330, 370, 3B0 or 3F0' CONFIG_OPL3SA1_MPU_BASE 330 + int ' OPL3-SA1 MIDI IRQ 3, 4, 5, 7 or 9' CONFIG_OPL3SA1_MPU_IRQ 9 fi - dep_tristate 'SoftOSS software wave table engine' CONFIG_SOUND_SOFTOSS $CONFIG_SOUND_OSS + dep_tristate ' SoftOSS software wave table engine' CONFIG_SOUND_SOFTOSS $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_SOFTOSS" = "y" ]; then - int 'Sampling rate for SoftOSS 8000 to 48000' CONFIG_SOFTOSS_RATE 22050 - int 'Max # of concurrent voices for SoftOSS 4 to 32' CONFIG_SOFTOSS_VOICES 32 + int ' Sampling rate for SoftOSS 8000 to 48000' CONFIG_SOFTOSS_RATE 22050 + int ' Max # of concurrent voices for SoftOSS 4 to 32' CONFIG_SOFTOSS_VOICES 32 fi - dep_tristate 'FM synthesizer (YM3812/OPL-3) support' CONFIG_SOUND_YM3812 $CONFIG_SOUND_OSS + dep_tristate ' FM synthesizer (YM3812/OPL-3) support' CONFIG_SOUND_YM3812 $CONFIG_SOUND_OSS - dep_tristate 'Loopback MIDI device support' CONFIG_SOUND_VMIDI $CONFIG_SOUND_OSS + dep_tristate ' Loopback MIDI device support' CONFIG_SOUND_VMIDI $CONFIG_SOUND_OSS - dep_tristate '6850 UART support' CONFIG_SOUND_UART6850 $CONFIG_SOUND_OSS + dep_tristate ' 6850 UART support' CONFIG_SOUND_UART6850 $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_UART6850" = "y" ]; then - hex 'I/O base for UART 6850 MIDI port (Unknown)' CONFIG_U6850_BASE 0 - int 'UART6850 IRQ (Unknown)' CONFIG_U6850_IRQ -1 + hex ' I/O base for UART 6850 MIDI port (Unknown)' CONFIG_U6850_BASE 0 + int ' UART6850 IRQ (Unknown)' CONFIG_U6850_IRQ -1 fi if [ "$CONFIG_ARM" = "y" ]; then - dep_tristate 'VIDC 16-bit sound' CONFIG_SOUND_VIDC $CONFIG_SOUND_OSS - dep_tristate 'Netwinder WaveArtist' CONFIG_SOUND_WAVEARTIST $CONFIG_SOUND_OSS + dep_tristate ' VIDC 16-bit sound' CONFIG_SOUND_VIDC $CONFIG_SOUND_OSS + dep_tristate ' Netwinder WaveArtist' CONFIG_SOUND_WAVEARTIST $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_WAVEARTIST" != "n" ]; then - hex ' WaveArtist I/O base' CONFIG_WAVEARTIST_BASE 250 - int ' WaveArtist IRQ' CONFIG_WAVEARTIST_IRQ 12 - int ' WaveArtist DMA' CONFIG_WAVEARTIST_DMA 3 - int ' WaveArtist second DMA' CONFIG_WAVEARTIST_DMA2 7 + hex ' WaveArtist I/O base' CONFIG_WAVEARTIST_BASE 250 + int ' WaveArtist IRQ' CONFIG_WAVEARTIST_IRQ 12 + int ' WaveArtist DMA' CONFIG_WAVEARTIST_DMA 3 + int ' WaveArtist second DMA' CONFIG_WAVEARTIST_DMA2 7 fi fi - dep_tristate 'NM256AV/NM256ZX audio support' CONFIG_SOUND_NM256 $CONFIG_SOUND_OSS - dep_tristate 'Yamaha PCI native mode support' CONFIG_SOUND_YMFPCI $CONFIG_SOUND_OSS + dep_tristate ' NM256AV/NM256ZX audio support' CONFIG_SOUND_NM256 $CONFIG_SOUND_OSS + dep_tristate ' Yamaha PCI native mode support' CONFIG_SOUND_YMFPCI $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_YMFPCI" != "n" ]; then - bool ' Yamaha PCI legacy ports support' CONFIG_SOUND_YMFPCI_LEGACY + bool ' Yamaha PCI legacy ports support' CONFIG_SOUND_YMFPCI_LEGACY fi # Additional low level drivers. @@ -328,3 +331,5 @@ if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND_OSS" = "m" ]; then endmenu fi +fi +endmenu diff --git a/drivers/sound/lowlevel/Config.in b/drivers/sound/lowlevel/Config.in index 15e55e42d5aa..4c62cd3c3371 100644 --- a/drivers/sound/lowlevel/Config.in +++ b/drivers/sound/lowlevel/Config.in @@ -1,57 +1,57 @@ -dep_tristate 'ACI mixer (miroPCM12)' CONFIG_ACI_MIXER $CONFIG_SOUND_OSS -dep_tristate 'MSP3400 Audio for BT848' CONFIG_VIDEO_MSP3400 $CONFIG_VIDEO_BT848 $CONFIG_SOUND +dep_tristate ' ACI mixer (miroPCM12)' CONFIG_ACI_MIXER $CONFIG_SOUND_OSS +dep_tristate ' MSP3400 Audio for BT848' CONFIG_VIDEO_MSP3400 $CONFIG_VIDEO_BT848 $CONFIG_SOUND -dep_tristate 'AWE32 synth' CONFIG_AWE32_SYNTH $CONFIG_SOUND_OSS +dep_tristate ' AWE32 synth' CONFIG_AWE32_SYNTH $CONFIG_SOUND_OSS if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND" = "m" ]; then - dep_tristate 'Gallant Audio Cards (SC-6000 and SC-6600 based)' CONFIG_AEDSP16 $CONFIG_SOUND_OSS + dep_tristate ' Gallant Audio Cards (SC-6000 and SC-6600 based)' CONFIG_AEDSP16 $CONFIG_SOUND_OSS if [ "$CONFIG_AEDSP16" = "y" -o "$CONFIG_AEDSP16" = "m" ]; then hex ' I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220 - hex 'I/O base for MPU401 Check from manual of the card' CONFIG_MPU_BASE 330 + hex ' I/O base for MPU401 Check from manual of the card' CONFIG_MPU_BASE 330 fi if [ "$CONFIG_AEDSP16" = "y" -o "$CONFIG_AEDSP16" = "m" ]; then - comment 'SC-6600 Audio Cards have no jumper switches at all' - bool 'SC-6600 based audio cards (new Audio Excel DSP 16)' CONFIG_SC6600 + comment ' SC-6600 Audio Cards have no jumper switches at all' + bool ' SC-6600 based audio cards (new Audio Excel DSP 16)' CONFIG_SC6600 if [ "$CONFIG_SC6600" = "y" ]; then - comment 'SC-6600 specific configuration' - bool 'Activate SC-6600 Joystick Interface' CONFIG_SC6600_JOY - int 'SC-6600 CDROM Interface (4=None, 3=IDE, 1=Panasonic, 0=?Sony?)' CONFIG_SC6600_CDROM 4 - hex 'SC-6600 CDROM Interface I/O Address' CONFIG_SC6600_CDROMBASE 0 + comment ' SC-6600 specific configuration' + bool ' Activate SC-6600 Joystick Interface' CONFIG_SC6600_JOY + int ' SC-6600 CDROM Interface (4=None, 3=IDE, 1=Panasonic, 0=?Sony?)' CONFIG_SC6600_CDROM 4 + hex ' SC-6600 CDROM Interface I/O Address' CONFIG_SC6600_CDROMBASE 0 fi if [ "$CONFIG_SOUND_SB" = "y" -o "$CONFIG_SOUND_SB" = "m" ]; then if [ "$CONFIG_AEDSP16_MSS" != "y" ]; then - bool 'Audio Excel DSP 16 (SBPro emulation)' CONFIG_AEDSP16_SBPRO + bool ' Audio Excel DSP 16 (SBPro emulation)' CONFIG_AEDSP16_SBPRO if [ "$CONFIG_AEDSP16_SBPRO" = "y" ]; then - comment 'Audio Excel DSP 16 [Sound Blaster Pro]' - hex 'I/O base for Audio Excel DSP 16 220, 240' CONFIG_AEDSP16_BASE $CONFIG_SB_BASE 220 - int 'Audio Excel DSP 16 IRQ 5, 7, 9, 10, 11' CONFIG_AEDSP16_SB_IRQ $CONFIG_SB_IRQ 5 - int 'Audio Excel DSP 16 DMA 0, 1 or 3' CONFIG_AEDSP16_SB_DMA $CONFIG_SB_DMA 0 + comment ' Audio Excel DSP 16 [Sound Blaster Pro]' + hex ' I/O base for Audio Excel DSP 16 220, 240' CONFIG_AEDSP16_BASE $CONFIG_SB_BASE 220 + int ' Audio Excel DSP 16 IRQ 5, 7, 9, 10, 11' CONFIG_AEDSP16_SB_IRQ $CONFIG_SB_IRQ 5 + int ' Audio Excel DSP 16 DMA 0, 1 or 3' CONFIG_AEDSP16_SB_DMA $CONFIG_SB_DMA 0 fi fi fi if [ "$CONFIG_SOUND_MSS" = "y" -o "$CONFIG_SOUND_MSS" = "m" ]; then if [ "$CONFIG_AEDSP16_SBPRO" != "y" ]; then - bool 'Audio Excel DSP 16 (MSS emulation)' CONFIG_AEDSP16_MSS + bool ' Audio Excel DSP 16 (MSS emulation)' CONFIG_AEDSP16_MSS if [ "$CONFIG_AEDSP16_MSS" = "y" ]; then - comment 'Audio Excel DSP 16 [Microsoft Sound System]' - hex 'I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220 - int 'Audio Excel DSP 16 IRQ 5, 7, 9, 10, 11' CONFIG_AEDSP16_MSS_IRQ $CONFIG_MSS_IRQ 5 - int 'Audio Excel DSP 16 DMA 0, 1 or 3' CONFIG_AEDSP16_MSS_DMA $CONFIG_MSS_DMA 1 + comment ' Audio Excel DSP 16 [Microsoft Sound System]' + hex ' I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220 + int ' Audio Excel DSP 16 IRQ 5, 7, 9, 10, 11' CONFIG_AEDSP16_MSS_IRQ $CONFIG_MSS_IRQ 5 + int ' Audio Excel DSP 16 DMA 0, 1 or 3' CONFIG_AEDSP16_MSS_DMA $CONFIG_MSS_DMA 1 fi fi fi if [ "$CONFIG_SOUND_MPU401" = "y" -o "$CONFIG_SOUND_MPU401" = "m" ]; then - bool 'Audio Excel DSP 16 (MPU401 emulation)' CONFIG_AEDSP16_MPU401 + bool ' Audio Excel DSP 16 (MPU401 emulation)' CONFIG_AEDSP16_MPU401 if [ "$CONFIG_AEDSP16_MPU401" = "y" ]; then - comment 'Audio Excel DSP 16 [MPU-401]' + comment ' Audio Excel DSP 16 [MPU-401]' if [ "$CONFIG_AEDSP16_SBPRO" != "y" -a "$CONFIG_AEDSP16_MSS" != "y" ]; then - hex 'I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220 + hex ' I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220 fi - int 'MPU401 IRQ for Audio Excel DSP 16 5, 7, 9, 10 or 0 (disable)' CONFIG_AEDSP16_MPU_IRQ $CONFIG_MPU_IRQ + int ' MPU401 IRQ for Audio Excel DSP 16 5, 7, 9, 10 or 0 (disable)' CONFIG_AEDSP16_MPU_IRQ $CONFIG_MPU_IRQ fi fi fi diff --git a/drivers/telephony/Config.in b/drivers/telephony/Config.in index 84b18c818955..85cfdcf671b7 100644 --- a/drivers/telephony/Config.in +++ b/drivers/telephony/Config.in @@ -5,5 +5,5 @@ mainmenu_option next_comment comment 'Telephony Support' tristate 'Linux telephony support' CONFIG_PHONE -dep_tristate 'QuickNet Internet LineJack/PhoneJack support' CONFIG_PHONE_IXJ $CONFIG_PHONE +dep_tristate ' QuickNet Internet LineJack/PhoneJack support' CONFIG_PHONE_IXJ $CONFIG_PHONE endmenu diff --git a/drivers/video/Config.in b/drivers/video/Config.in index 63754b20ed92..a6d6e01f71df 100644 --- a/drivers/video/Config.in +++ b/drivers/video/Config.in @@ -6,23 +6,23 @@ if [ "$CONFIG_FB" = "y" ]; then define_bool CONFIG_DUMMY_CONSOLE y if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_PCI" = "y" ]; then - tristate 'Permedia2 support (experimental)' CONFIG_FB_PM2 + tristate ' Permedia2 support (experimental)' CONFIG_FB_PM2 if [ "$CONFIG_FB_PM2" = "y" ]; then if [ "$CONFIG_PCI" = "y" ]; then - bool ' enable FIFO disconnect feature' CONFIG_FB_PM2_FIFO_DISCONNECT - bool ' generic Permedia2 PCI board support' CONFIG_FB_PM2_PCI + bool ' enable FIFO disconnect feature' CONFIG_FB_PM2_FIFO_DISCONNECT + bool ' generic Permedia2 PCI board support' CONFIG_FB_PM2_PCI fi if [ "$CONFIG_AMIGA" = "y" ]; then - bool ' Phase5 CVisionPPC/BVisionPPC support' CONFIG_FB_PM2_CVPPC + bool ' Phase5 CVisionPPC/BVisionPPC support' CONFIG_FB_PM2_CVPPC fi fi fi fi if [ "$CONFIG_ARCH_ACORN" = "y" ]; then - bool 'Acorn VIDC support' CONFIG_FB_ACORN + bool ' Acorn VIDC support' CONFIG_FB_ACORN fi if [ "$CONFIG_ARCH_NETWINDER" = "y" ]; then - tristate 'Cyber2000 support' CONFIG_FB_CYBER2000 + tristate ' Cyber2000 support' CONFIG_FB_CYBER2000 fi if [ "$CONFIG_APOLLO" = "y" ]; then define_bool CONFIG_FB_APOLLO y @@ -31,124 +31,124 @@ if [ "$CONFIG_FB" = "y" ]; then define_bool CONFIG_FB_Q40 y fi if [ "$CONFIG_AMIGA" = "y" ]; then - bool 'Amiga native chipset support' CONFIG_FB_AMIGA + bool ' Amiga native chipset support' CONFIG_FB_AMIGA if [ "$CONFIG_FB_AMIGA" != "n" ]; then - bool 'Amiga OCS chipset support' CONFIG_FB_AMIGA_OCS - bool 'Amiga ECS chipset support' CONFIG_FB_AMIGA_ECS - bool 'Amiga AGA chipset support' CONFIG_FB_AMIGA_AGA + bool ' Amiga OCS chipset support' CONFIG_FB_AMIGA_OCS + bool ' Amiga ECS chipset support' CONFIG_FB_AMIGA_ECS + bool ' Amiga AGA chipset support' CONFIG_FB_AMIGA_AGA fi fi if [ "$CONFIG_ZORRO" = "y" ]; then - tristate 'Amiga CyberVision support' CONFIG_FB_CYBER + tristate ' Amiga CyberVision support' CONFIG_FB_CYBER if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - bool 'Amiga CyberVision3D support (experimental)' CONFIG_FB_VIRGE - tristate 'Amiga RetinaZ3 support' CONFIG_FB_RETINAZ3 - tristate 'Amiga CLgen driver' CONFIG_FB_CLGEN - bool 'Amiga FrameMaster II/Rainbow II support (experimental)' CONFIG_FB_FM2 + bool ' Amiga CyberVision3D support (experimental)' CONFIG_FB_VIRGE + tristate ' Amiga RetinaZ3 support' CONFIG_FB_RETINAZ3 + tristate ' Amiga CLgen driver' CONFIG_FB_CLGEN + bool ' Amiga FrameMaster II/Rainbow II support (experimental)' CONFIG_FB_FM2 fi fi if [ "$CONFIG_ATARI" = "y" ]; then - bool 'Atari native chipset support' CONFIG_FB_ATARI + bool ' Atari native chipset support' CONFIG_FB_ATARI fi if [ "$CONFIG_ATARI" = "y" -o "$CONFIG_PCI" = "y" ]; then - tristate 'ATI Mach64 display support' CONFIG_FB_ATY + tristate ' ATI Mach64 display support' CONFIG_FB_ATY fi if [ "$CONFIG_PPC" = "y" ]; then - bool 'Open Firmware frame buffer device support' CONFIG_FB_OF + bool ' Open Firmware frame buffer device support' CONFIG_FB_OF if [ "$CONFIG_FB_OF" = "y" ]; then - bool 'Apple "control" display support' CONFIG_FB_CONTROL - bool 'Apple "platinum" display support' CONFIG_FB_PLATINUM - bool 'Apple "valkyrie" display support' CONFIG_FB_VALKYRIE - bool 'IMS Twin Turbo display support' CONFIG_FB_IMSTT - bool 'Chips 65550 display support' CONFIG_FB_CT65550 - bool 'S3 Trio display support' CONFIG_FB_S3TRIO - bool 'Backward compatibility mode for Xpmac' CONFIG_FB_COMPAT_XPMAC + bool ' Apple "control" display support' CONFIG_FB_CONTROL + bool ' Apple "platinum" display support' CONFIG_FB_PLATINUM + bool ' Apple "valkyrie" display support' CONFIG_FB_VALKYRIE + bool ' IMS Twin Turbo display support' CONFIG_FB_IMSTT + bool ' Chips 65550 display support' CONFIG_FB_CT65550 + bool ' S3 Trio display support' CONFIG_FB_S3TRIO + bool ' Backward compatibility mode for Xpmac' CONFIG_FB_COMPAT_XPMAC fi fi if [ "$CONFIG_MAC" = "y" ]; then - bool 'Apple "valkyrie" display support' CONFIG_FB_VALKYRIE -# bool 'Apple DAFB display support' CONFIG_FB_DAFB + bool ' Apple "valkyrie" display support' CONFIG_FB_VALKYRIE +# bool ' Apple DAFB display support' CONFIG_FB_DAFB define_bool CONFIG_FB_MAC y fi if [ "$CONFIG_HP300" = "y" ]; then define_bool CONFIG_FB_HP300 y fi if [ "$ARCH" = "alpha" ]; then - tristate 'TGA framebuffer support' CONFIG_FB_TGA + tristate ' TGA framebuffer support' CONFIG_FB_TGA fi if [ "$ARCH" = "i386" ]; then - bool 'VESA VGA graphics console' CONFIG_FB_VESA - bool 'VGA 16-color graphics console' CONFIG_FB_VGA16 + bool ' VESA VGA graphics console' CONFIG_FB_VESA + bool ' VGA 16-color graphics console' CONFIG_FB_VGA16 define_bool CONFIG_VIDEO_SELECT y fi if [ "$CONFIG_VISWS" = "y" ]; then - tristate 'SGI Visual Workstation framebuffer support' CONFIG_FB_SGIVW + tristate ' SGI Visual Workstation framebuffer support' CONFIG_FB_SGIVW define_bool CONFIG_BUS_I2C y fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_PCI" = "y" -a "$ARCH" != "sparc" -a "$ARCH" != "sparc64" ]; then - tristate 'Matrox acceleration' CONFIG_FB_MATROX + tristate ' Matrox acceleration' CONFIG_FB_MATROX if [ "$CONFIG_FB_MATROX" != "n" ]; then - bool ' Millennium I/II support' CONFIG_FB_MATROX_MILLENIUM - bool ' Mystique support' CONFIG_FB_MATROX_MYSTIQUE - bool ' G100/G200 support' CONFIG_FB_MATROX_G100 - bool ' Multihead support' CONFIG_FB_MATROX_MULTIHEAD + bool ' Millennium I/II support' CONFIG_FB_MATROX_MILLENIUM + bool ' Mystique support' CONFIG_FB_MATROX_MYSTIQUE + bool ' G100/G200 support' CONFIG_FB_MATROX_G100 + bool ' Multihead support' CONFIG_FB_MATROX_MULTIHEAD fi - tristate 'ATI Rage128 display support' CONFIG_FB_ATY128 + tristate ' ATI Rage128 display support' CONFIG_FB_ATY128 fi fi if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then bool 'SBUS and UPA framebuffers' CONFIG_FB_SBUS if [ "$CONFIG_FB_SBUS" != "n" ]; then if [ "$ARCH" = "sparc64" ]; then - bool ' Creator/Creator3D support' CONFIG_FB_CREATOR + bool ' Creator/Creator3D support' CONFIG_FB_CREATOR fi - bool ' CGsix (GX,TurboGX) support' CONFIG_FB_CGSIX - bool ' BWtwo support' CONFIG_FB_BWTWO - bool ' CGthree support' CONFIG_FB_CGTHREE + bool ' CGsix (GX,TurboGX) support' CONFIG_FB_CGSIX + bool ' BWtwo support' CONFIG_FB_BWTWO + bool ' CGthree support' CONFIG_FB_CGTHREE if [ "$ARCH" = "sparc" ]; then - bool ' TCX (SS4/SS5 only) support' CONFIG_FB_TCX - bool ' CGfourteen (SX) support' CONFIG_FB_CGFOURTEEN + bool ' TCX (SS4/SS5 only) support' CONFIG_FB_TCX + bool ' CGfourteen (SX) support' CONFIG_FB_CGFOURTEEN fi - bool ' Leo (ZX) support' CONFIG_FB_LEO + bool ' Leo (ZX) support' CONFIG_FB_LEO fi fi if [ "$ARCH" = "sparc" ]; then if [ "$CONFIG_PCI" = "y" ]; then - bool 'PCI framebuffers' CONFIG_FB_PCI + bool ' PCI framebuffers' CONFIG_FB_PCI if [ "$CONFIG_FB_PCI" != "n" ]; then - bool ' IGA 168x display support' CONFIG_FB_IGA + bool ' IGA 168x display support' CONFIG_FB_IGA fi fi fi if [ "$ARCH" = "sparc64" ]; then if [ "$CONFIG_PCI" != "n" ]; then - bool 'PCI framebuffers' CONFIG_FB_PCI + bool ' PCI framebuffers' CONFIG_FB_PCI if [ "$CONFIG_FB_PCI" != "n" ]; then - bool ' ATI Mach64 display support' CONFIG_FB_ATY + bool ' ATI Mach64 display support' CONFIG_FB_ATY fi fi fi - tristate 'Virtual Frame Buffer support (ONLY FOR TESTING!)' CONFIG_FB_VIRTUAL + tristate ' Virtual Frame Buffer support (ONLY FOR TESTING!)' CONFIG_FB_VIRTUAL - bool 'Advanced low level driver options' CONFIG_FBCON_ADVANCED + bool ' Advanced low level driver options' CONFIG_FBCON_ADVANCED if [ "$CONFIG_FBCON_ADVANCED" = "y" ]; then - tristate 'Monochrome support' CONFIG_FBCON_MFB - tristate '2 bpp packed pixels support' CONFIG_FBCON_CFB2 - tristate '4 bpp packed pixels support' CONFIG_FBCON_CFB4 - tristate '8 bpp packed pixels support' CONFIG_FBCON_CFB8 - tristate '16 bpp packed pixels support' CONFIG_FBCON_CFB16 - tristate '24 bpp packed pixels support' CONFIG_FBCON_CFB24 - tristate '32 bpp packed pixels support' CONFIG_FBCON_CFB32 - tristate 'Amiga bitplanes support' CONFIG_FBCON_AFB - tristate 'Amiga interleaved bitplanes support' CONFIG_FBCON_ILBM - tristate 'Atari interleaved bitplanes (2 planes) support' CONFIG_FBCON_IPLAN2P2 - tristate 'Atari interleaved bitplanes (4 planes) support' CONFIG_FBCON_IPLAN2P4 - tristate 'Atari interleaved bitplanes (8 planes) support' CONFIG_FBCON_IPLAN2P8 -# tristate 'Atari interleaved bitplanes (16 planes) support' CONFIG_FBCON_IPLAN2P16 - tristate 'Mac variable bpp packed pixels support' CONFIG_FBCON_MAC - bool 'VGA 16-color planar support' CONFIG_FBCON_VGA_PLANES - tristate 'VGA characters/attributes support' CONFIG_FBCON_VGA + tristate ' Monochrome support' CONFIG_FBCON_MFB + tristate ' 2 bpp packed pixels support' CONFIG_FBCON_CFB2 + tristate ' 4 bpp packed pixels support' CONFIG_FBCON_CFB4 + tristate ' 8 bpp packed pixels support' CONFIG_FBCON_CFB8 + tristate ' 16 bpp packed pixels support' CONFIG_FBCON_CFB16 + tristate ' 24 bpp packed pixels support' CONFIG_FBCON_CFB24 + tristate ' 32 bpp packed pixels support' CONFIG_FBCON_CFB32 + tristate ' Amiga bitplanes support' CONFIG_FBCON_AFB + tristate ' Amiga interleaved bitplanes support' CONFIG_FBCON_ILBM + tristate ' Atari interleaved bitplanes (2 planes) support' CONFIG_FBCON_IPLAN2P2 + tristate ' Atari interleaved bitplanes (4 planes) support' CONFIG_FBCON_IPLAN2P4 + tristate ' Atari interleaved bitplanes (8 planes) support' CONFIG_FBCON_IPLAN2P8 +# tristate ' Atari interleaved bitplanes (16 planes) support' CONFIG_FBCON_IPLAN2P16 + tristate ' Mac variable bpp packed pixels support' CONFIG_FBCON_MAC + bool ' VGA 16-color planar support' CONFIG_FBCON_VGA_PLANES + tristate ' VGA characters/attributes support' CONFIG_FBCON_VGA else # Guess what we need if [ "$CONFIG_FB_ACORN" = "y" -o "$CONFIG_FB_AMIGA" = "y" -o \ @@ -304,34 +304,34 @@ if [ "$CONFIG_FB" = "y" ]; then fi fi fi - bool 'Support only 8 pixels wide fonts' CONFIG_FBCON_FONTWIDTH8_ONLY + bool ' Support only 8 pixels wide fonts' CONFIG_FBCON_FONTWIDTH8_ONLY if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then - bool 'Sparc console 8x16 font' CONFIG_FONT_SUN8x16 + bool ' Sparc console 8x16 font' CONFIG_FONT_SUN8x16 if [ "$CONFIG_FBCON_FONTWIDTH8_ONLY" = "n" ]; then - bool 'Sparc console 12x22 font (not supported by all drivers)' CONFIG_FONT_SUN12x22 + bool ' Sparc console 12x22 font (not supported by all drivers)' CONFIG_FONT_SUN12x22 fi - bool 'Select other fonts' CONFIG_FBCON_FONTS + bool ' Select other fonts' CONFIG_FBCON_FONTS if [ "$CONFIG_FBCON_FONTS" = "y" ]; then - bool ' VGA 8x8 font' CONFIG_FONT_8x8 - bool ' VGA 8x16 font' CONFIG_FONT_8x16 + bool ' VGA 8x8 font' CONFIG_FONT_8x8 + bool ' VGA 8x16 font' CONFIG_FONT_8x16 if [ "$CONFIG_FBCON_FONTWIDTH8_ONLY" = "n" ]; then - bool ' Mac console 6x11 font (not supported by all drivers)' CONFIG_FONT_6x11 + bool ' Mac console 6x11 font (not supported by all drivers)' CONFIG_FONT_6x11 fi - bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8 - bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8 + bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8 + bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8 fi else - bool 'Select compiled-in fonts' CONFIG_FBCON_FONTS + bool ' Select compiled-in fonts' CONFIG_FBCON_FONTS if [ "$CONFIG_FBCON_FONTS" = "y" ]; then - bool ' VGA 8x8 font' CONFIG_FONT_8x8 - bool ' VGA 8x16 font' CONFIG_FONT_8x16 - bool ' Sparc console 8x16 font' CONFIG_FONT_SUN8x16 + bool ' VGA 8x8 font' CONFIG_FONT_8x8 + bool ' VGA 8x16 font' CONFIG_FONT_8x16 + bool ' Sparc console 8x16 font' CONFIG_FONT_SUN8x16 if [ "$CONFIG_FBCON_FONTWIDTH8_ONLY" = "n" ]; then - bool ' Sparc console 12x22 font (not supported by all drivers)' CONFIG_FONT_SUN12x22 - bool ' Mac console 6x11 font (not supported by all drivers)' CONFIG_FONT_6x11 + bool ' Sparc console 12x22 font (not supported by all drivers)' CONFIG_FONT_SUN12x22 + bool ' Mac console 6x11 font (not supported by all drivers)' CONFIG_FONT_6x11 fi - bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8 - bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8 + bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8 + bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8 else define_bool CONFIG_FONT_8x8 y define_bool CONFIG_FONT_8x16 y diff --git a/fs/Config.in b/fs/Config.in index 2fe9886385f9..085de1ddc5c7 100644 --- a/fs/Config.in +++ b/fs/Config.in @@ -2,7 +2,7 @@ # Filesystem configuration # mainmenu_option next_comment -comment 'Filesystems' +comment 'File systems' bool 'Quota support' CONFIG_QUOTA tristate 'Kernel automounter support' CONFIG_AUTOFS_FS @@ -44,7 +44,7 @@ fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'QNX4 filesystem support (read only) (EXPERIMENTAL)' CONFIG_QNX4FS_FS if [ "$CONFIG_QNX4FS_FS" != "n" ]; then - bool ' QNX4FS write support (DANGEROUS)' CONFIG_QNX4FS_RW + bool ' QNX4FS write support (DANGEROUS)' CONFIG_QNX4FS_RW fi fi tristate 'ROM filesystem support' CONFIG_ROMFS_FS @@ -52,7 +52,7 @@ tristate 'Ext2 filesystem support' CONFIG_EXT2_FS tristate 'System V and Coherent filesystem support' CONFIG_SYSV_FS tristate 'UFS filesystem support' CONFIG_UFS_FS if [ "$CONFIG_UFS_FS" != "n" ]; then - bool ' UFS filesystem write support (experimental)' CONFIG_UFS_FS_WRITE + bool ' UFS filesystem write support (experimental)' CONFIG_UFS_FS_WRITE fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'SGI EFS filesystem support (read only) (experimental)' CONFIG_EFS_FS @@ -70,16 +70,16 @@ if [ "$CONFIG_INET" = "y" ]; then tristate 'Coda filesystem support (advanced network fs)' CONFIG_CODA_FS tristate 'NFS filesystem support' CONFIG_NFS_FS if [ "$CONFIG_NFS_FS" != "n" ]; then - bool ' NFS Version 3 filesystem support' CONFIG_NFS_V3 + bool ' NFS Version 3 filesystem support' CONFIG_NFS_V3 fi if [ "$CONFIG_NFS_FS" = "y" -a "$CONFIG_IP_PNP" = "y" ]; then - bool ' Root file system on NFS' CONFIG_ROOT_NFS + bool ' Root file system on NFS' CONFIG_ROOT_NFS fi tristate 'NFS server support' CONFIG_NFSD if [ "$CONFIG_NFSD" != "n" ]; then - bool ' NFS Version 3 server support' CONFIG_NFSD_V3 + bool ' NFS Version 3 server support' CONFIG_NFSD_V3 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - bool ' NFS server TCP support (VERY EXPERIMENTAL)' CONFIG_NFSD_TCP + bool ' NFS server TCP support (VERY EXPERIMENTAL)' CONFIG_NFSD_TCP fi fi if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then @@ -96,7 +96,7 @@ if [ "$CONFIG_INET" = "y" ]; then fi tristate 'SMB filesystem support (to mount WfW shares etc.)' CONFIG_SMB_FS if [ "$CONFIG_SMB_FS" != "n" ]; then - bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT + bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT if [ "$CONFIG_SMB_NLS_DEFAULT" = "y" ]; then string ' Default Remote NLS Option' CONFIG_SMB_NLS_REMOTE "cp437" fi diff --git a/fs/attr.c b/fs/attr.c index 21adfd00ebbb..10930eb61ca4 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -29,7 +29,8 @@ int inode_change_ok(struct inode *inode, struct iattr *attr) /* Make sure caller can chgrp. */ if ((ia_valid & ATTR_GID) && - (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) && + (current->fsuid != inode->i_uid || + (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) && !capable(CAP_CHOWN)) goto error; diff --git a/fs/ncpfs/Config.in b/fs/ncpfs/Config.in index 11a1b1d367c6..6c91a9a698e5 100644 --- a/fs/ncpfs/Config.in +++ b/fs/ncpfs/Config.in @@ -1,15 +1,15 @@ # # NCP Filesystem configuration # -bool ' Packet signatures' CONFIG_NCPFS_PACKET_SIGNING -bool ' Proprietary file locking' CONFIG_NCPFS_IOCTL_LOCKING -bool ' Clear remove/delete inhibit when needed' CONFIG_NCPFS_STRONG -bool ' Use NFS namespace if available' CONFIG_NCPFS_NFS_NS -bool ' Use LONG (OS/2) namespace if available' CONFIG_NCPFS_OS2_NS +bool ' Packet signatures' CONFIG_NCPFS_PACKET_SIGNING +bool ' Proprietary file locking' CONFIG_NCPFS_IOCTL_LOCKING +bool ' Clear remove/delete inhibit when needed' CONFIG_NCPFS_STRONG +bool ' Use NFS namespace if available' CONFIG_NCPFS_NFS_NS +bool ' Use LONG (OS/2) namespace if available' CONFIG_NCPFS_OS2_NS if [ "$CONFIG_NCPFS_OS2_NS" = "y" ]; then - bool ' Lowercase DOS filenames' CONFIG_NCPFS_SMALLDOS + bool ' Lowercase DOS filenames' CONFIG_NCPFS_SMALLDOS fi -bool ' Allow mounting of volume subdirectories' CONFIG_NCPFS_MOUNT_SUBDIR -# bool ' NDS interserver authentication support' CONFIG_NCPFS_NDS_DOMAINS -bool ' Use Native Language Support' CONFIG_NCPFS_NLS -bool ' Enable symbolic links and execute flags' CONFIG_NCPFS_EXTRAS +bool ' Allow mounting of volume subdirectories' CONFIG_NCPFS_MOUNT_SUBDIR +# bool ' NDS interserver authentication support' CONFIG_NCPFS_NDS_DOMAINS +bool ' Use Native Language Support' CONFIG_NCPFS_NLS +bool ' Enable symbolic links and execute flags' CONFIG_NCPFS_EXTRAS diff --git a/include/linux/socket.h b/include/linux/socket.h index 837a3e4659ea..ab0820824251 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -70,6 +70,10 @@ struct cmsghdr { (struct cmsghdr *)(ctl) : \ (struct cmsghdr *)NULL) #define CMSG_FIRSTHDR(msg) __CMSG_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) +#define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) && \ + (cmsg)->cmsg_len <= (unsigned long) \ + ((mhdr)->msg_controllen - \ + ((char *)(cmsg) - (char *)(mhdr)->msg_control))) /* * This mess will go away with glibc diff --git a/net/Config.in b/net/Config.in index 3d1a55061033..6c4bc79432c2 100644 --- a/net/Config.in +++ b/net/Config.in @@ -20,7 +20,7 @@ if [ "$CONFIG_INET" = "y" ]; then tristate 'The IPv6 protocol (EXPERIMENTAL)' CONFIG_IPV6 # bool 'The IPv6 protocol (EXPERIMENTAL)' CONFIG_IPV6 if [ "$CONFIG_IPV6" != "n" ]; then - source net/ipv6/Config.in + source net/ipv6/Config.in fi fi fi diff --git a/net/ax25/Config.in b/net/ax25/Config.in index 6eabbcbe9043..14a6fd3f7b57 100644 --- a/net/ax25/Config.in +++ b/net/ax25/Config.in @@ -8,12 +8,12 @@ bool 'Amateur Radio support' CONFIG_HAMRADIO if [ "$CONFIG_HAMRADIO" != "n" ] ; then if [ "$CONFIG_NET" != "n" ] ; then comment 'Packet Radio protocols' - tristate 'Amateur Radio AX.25 Level 2 protocol' CONFIG_AX25 + tristate ' Amateur Radio AX.25 Level 2 protocol' CONFIG_AX25 if [ "$CONFIG_AX25" != "n" ]; then - bool ' AX.25 DAMA Slave support' CONFIG_AX25_DAMA_SLAVE -# bool ' AX.25 DAMA Master support' CONFIG_AX25_DAMA_MASTER - dep_tristate ' Amateur Radio NET/ROM protocol' CONFIG_NETROM $CONFIG_AX25 - dep_tristate ' Amateur Radio X.25 PLP (Rose)' CONFIG_ROSE $CONFIG_AX25 + bool ' AX.25 DAMA Slave support' CONFIG_AX25_DAMA_SLAVE +# bool ' AX.25 DAMA Master support' CONFIG_AX25_DAMA_MASTER + dep_tristate ' Amateur Radio NET/ROM protocol' CONFIG_NETROM $CONFIG_AX25 + dep_tristate ' Amateur Radio X.25 PLP (Rose)' CONFIG_ROSE $CONFIG_AX25 fi if [ "$CONFIG_AX25" != "n" ]; then diff --git a/net/core/scm.c b/net/core/scm.c index b69ec15fc401..7b40ed874205 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -129,9 +129,7 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p) for too short ancillary data object at all! Oops. OK, let's add it... */ - if (cmsg->cmsg_len < sizeof(struct cmsghdr) || - (unsigned long)(((char*)cmsg - (char*)msg->msg_control) - + cmsg->cmsg_len) > msg->msg_controllen) + if (!CMSG_OK(msg, cmsg)) goto error; if (cmsg->cmsg_level != SOL_SOCKET) diff --git a/net/ipv4/Config.in b/net/ipv4/Config.in index 94aa9bd85c08..5e3b5c52aaac 100644 --- a/net/ipv4/Config.in +++ b/net/ipv4/Config.in @@ -6,13 +6,13 @@ bool 'IP: advanced router' CONFIG_IP_ADVANCED_ROUTER if [ "$CONFIG_IP_ADVANCED_ROUTER" = "y" ]; then define_bool CONFIG_RTNETLINK y define_bool CONFIG_NETLINK y - bool 'IP: policy routing' CONFIG_IP_MULTIPLE_TABLES - bool 'IP: equal cost multipath' CONFIG_IP_ROUTE_MULTIPATH - bool 'IP: use TOS value as routing key' CONFIG_IP_ROUTE_TOS - bool 'IP: verbose route monitoring' CONFIG_IP_ROUTE_VERBOSE - bool 'IP: large routing tables' CONFIG_IP_ROUTE_LARGE_TABLES + bool ' IP: policy routing' CONFIG_IP_MULTIPLE_TABLES + bool ' IP: equal cost multipath' CONFIG_IP_ROUTE_MULTIPATH + bool ' IP: use TOS value as routing key' CONFIG_IP_ROUTE_TOS + bool ' IP: verbose route monitoring' CONFIG_IP_ROUTE_VERBOSE + bool ' IP: large routing tables' CONFIG_IP_ROUTE_LARGE_TABLES if [ "$CONFIG_IP_MULTIPLE_TABLES" = "y" ]; then - bool 'IP: fast network address translation' CONFIG_IP_ROUTE_NAT + bool ' IP: fast network address translation' CONFIG_IP_ROUTE_NAT fi fi bool 'IP: kernel-level configuration support' CONFIG_IP_PNP @@ -27,13 +27,13 @@ if [ "$CONFIG_FIREWALL" = "y" ]; then bool 'IP: firewalling' CONFIG_IP_FIREWALL if [ "$CONFIG_IP_FIREWALL" = "y" ]; then if [ "$CONFIG_NETLINK" = "y" ]; then - bool 'IP: firewall packet netlink device' CONFIG_IP_FIREWALL_NETLINK + bool ' IP: firewall packet netlink device' CONFIG_IP_FIREWALL_NETLINK if [ "$CONFIG_IP_FIREWALL_NETLINK" = "y" ]; then define_bool CONFIG_NETLINK_DEV y fi fi if [ "$CONFIG_IP_MULTIPLE_TABLES" = "y" ]; then - bool 'IP: use FWMARK value as routing key' CONFIG_IP_ROUTE_FWMARK + bool ' IP: use FWMARK value as routing key' CONFIG_IP_ROUTE_FWMARK fi fi fi diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index a7369ec88530..54dc0a5adc31 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -512,6 +512,8 @@ int ip_options_get(struct ip_options **optp, unsigned char *data, int optlen, in kfree_s(opt, sizeof(struct ip_options) + optlen); return -EINVAL; } + if (*optp) + kfree(*optp); *optp = opt; return 0; } diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 90dd8ab4689c..6f8ef2cee257 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -150,11 +150,8 @@ int ip_cmsg_send(struct msghdr *msg, struct ipcm_cookie *ipc) struct cmsghdr *cmsg; for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) { - if (cmsg->cmsg_len < sizeof(struct cmsghdr) || - (unsigned long)(((char*)cmsg - (char*)msg->msg_control) - + cmsg->cmsg_len) > msg->msg_controllen) { + if (!CMSG_OK(msg, cmsg)) return -EINVAL; - } if (cmsg->cmsg_level != SOL_IP) continue; switch (cmsg->cmsg_type) { diff --git a/net/ipv6/Config.in b/net/ipv6/Config.in index a2908aec94c5..02f11b7ff110 100644 --- a/net/ipv6/Config.in +++ b/net/ipv6/Config.in @@ -1,16 +1,16 @@ # # IPv6 configuration # -bool 'IPv6: enable EUI-64 token format' CONFIG_IPV6_EUI64 +bool ' IPv6: enable EUI-64 token format' CONFIG_IPV6_EUI64 if [ "$CONFIG_IPV6_EUI64" = "y" ]; then - bool 'IPv6: disable provider based addresses' CONFIG_IPV6_NO_PB + bool ' IPv6: disable provider based addresses' CONFIG_IPV6_NO_PB fi if [ "$CONFIG_NETLINK" = "y" ]; then if [ "$CONFIG_NETLINK_DEV" != "n" ]; then if [ "$CONFIG_RTNETLINK" = "n" ]; then - bool 'IPv6: routing messages via old netlink' CONFIG_IPV6_NETLINK + bool ' IPv6: routing messages via old netlink' CONFIG_IPV6_NETLINK fi fi fi -#bool 'IPv6: flow policy support' CONFIG_RT6_POLICY -#bool 'IPv6: firewall support' CONFIG_IPV6_FIREWALL +#bool ' IPv6: flow policy support' CONFIG_RT6_POLICY +#bool ' IPv6: firewall support' CONFIG_IPV6_FIREWALL diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 4fc7858290ad..9df403526a02 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -243,9 +243,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl, for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) { - if (cmsg->cmsg_len < sizeof(struct cmsghdr) || - (unsigned long)(((char*)cmsg - (char*)msg->msg_control) - + cmsg->cmsg_len) > msg->msg_controllen) { + if (!CMSG_OK(msg, cmsg)) { err = -EINVAL; goto exit_f; } diff --git a/net/ipx/Config.in b/net/ipx/Config.in index 17080b0c6524..0070c5813e29 100644 --- a/net/ipx/Config.in +++ b/net/ipx/Config.in @@ -2,7 +2,7 @@ # IPX configuration # -bool 'IPX: Full internal IPX network' CONFIG_IPX_INTERN +bool ' IPX: Full internal IPX network' CONFIG_IPX_INTERN if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - dep_tristate 'IPX: SPX networking (EXPERIMENTAL)' CONFIG_SPX $CONFIG_IPX + dep_tristate ' IPX: SPX networking (EXPERIMENTAL)' CONFIG_SPX $CONFIG_IPX fi diff --git a/net/sched/Config.in b/net/sched/Config.in index ffb7a48108e0..770e0373740c 100644 --- a/net/sched/Config.in +++ b/net/sched/Config.in @@ -3,31 +3,31 @@ # define_bool CONFIG_NETLINK y define_bool CONFIG_RTNETLINK y -tristate 'CBQ packet scheduler' CONFIG_NET_SCH_CBQ -tristate 'CSZ packet scheduler' CONFIG_NET_SCH_CSZ -#tristate 'H-PFQ packet scheduler' CONFIG_NET_SCH_HPFQ -#tristate 'H-FSC packet scheduler' CONFIG_NET_SCH_HFCS -tristate 'The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO -tristate 'RED queue' CONFIG_NET_SCH_RED -tristate 'SFQ queue' CONFIG_NET_SCH_SFQ -tristate 'TEQL queue' CONFIG_NET_SCH_TEQL -tristate 'TBF queue' CONFIG_NET_SCH_TBF -bool 'QoS support' CONFIG_NET_QOS +tristate ' CBQ packet scheduler' CONFIG_NET_SCH_CBQ +tristate ' CSZ packet scheduler' CONFIG_NET_SCH_CSZ +#tristate ' H-PFQ packet scheduler' CONFIG_NET_SCH_HPFQ +#tristate ' H-FSC packet scheduler' CONFIG_NET_SCH_HFCS +tristate ' The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO +tristate ' RED queue' CONFIG_NET_SCH_RED +tristate ' SFQ queue' CONFIG_NET_SCH_SFQ +tristate ' TEQL queue' CONFIG_NET_SCH_TEQL +tristate ' TBF queue' CONFIG_NET_SCH_TBF +bool ' QoS support' CONFIG_NET_QOS if [ "$CONFIG_NET_QOS" = "y" ]; then - bool 'Rate estimator' CONFIG_NET_ESTIMATOR + bool ' Rate estimator' CONFIG_NET_ESTIMATOR fi -bool 'Packet classifier API' CONFIG_NET_CLS +bool ' Packet classifier API' CONFIG_NET_CLS if [ "$CONFIG_NET_CLS" = "y" ]; then - tristate 'Routing table based classifier' CONFIG_NET_CLS_ROUTE4 + tristate ' Routing table based classifier' CONFIG_NET_CLS_ROUTE4 if [ "$CONFIG_NET_CLS_ROUTE4" != "n" ]; then define_bool CONFIG_NET_CLS_ROUTE y fi - tristate 'Firewall based classifier' CONFIG_NET_CLS_FW - tristate 'U32 classifier' CONFIG_NET_CLS_U32 + tristate ' Firewall based classifier' CONFIG_NET_CLS_FW + tristate ' U32 classifier' CONFIG_NET_CLS_U32 if [ "$CONFIG_NET_QOS" = "y" ]; then - tristate 'Special RSVP classifier' CONFIG_NET_CLS_RSVP - tristate 'Special RSVP classifier for IPv6' CONFIG_NET_CLS_RSVP6 - bool 'Ingres traffic policing' CONFIG_NET_CLS_POLICE + tristate ' Special RSVP classifier' CONFIG_NET_CLS_RSVP + tristate ' Special RSVP classifier for IPv6' CONFIG_NET_CLS_RSVP6 + bool ' Ingres traffic policing' CONFIG_NET_CLS_POLICE fi fi -- 2.39.5