diff options
105 files changed, 2009 insertions, 3276 deletions
@@ -771,7 +771,7 @@ W: http://www.dell.com/linux W: http://domsch.com/linux D: Linux/IA-64 D: Dell PowerEdge server, SCSI layer, misc drivers, and other patches -S: Dell Computer Corporation +S: Dell Inc. S: One Dell Way S: Round Rock, TX 78682 S: USA diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index 850354876aa6..33e3afadad77 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt @@ -6,8 +6,9 @@ Table of contents ================= - Overview -- Supported mount options +- Web site - Features +- Supported mount options - Known bugs and (mis-)features - Using Software RAID with NTFS - Limitiations when using the MD driver @@ -17,13 +18,59 @@ Table of contents Overview ======== -To mount an NTFS 1.2/3.x (Windows NT4/2000/XP) volume, use the filesystem -type 'ntfs'. The driver currently works only in read-only mode, with no -fault-tolerance or journalling supported. +Linux-NTFS comes with a number of user-space programs known as ntfsprogs. +These include mkntfs, a full-featured ntfs file system format utility, +ntfsundelete used for recovering files that were unintentionally deleted +from an NTFS volume and ntfsresize which is used to resize an NTFS partition. +See the web site for more information. + +To mount an NTFS 1.2/3.x (Windows NT4/2000/XP/2003) volume, use the file +system type 'ntfs'. The driver currently supports read-only mode (with no +fault-tolerance, encryption or journalling) and very limited, but safe, write +support. + +For fault tolerance and raid support (i.e. volume and stripe sets), you can +use the kernel's Software RAID / MD driver. See section "Using Software RAID +with NTFS" for details. + + +Web site +======== + +There is plenty of additional information on the linux-ntfs web site +at http://linux-ntfs.sourceforge.net/ + +The web site has a lot of additional information, such as a comprehensive +FAQ, documentation on the NTFS on-disk format, informaiton on the Linux-NTFS +userspace utilities, etc. -For fault tolerance and raid support (i.e. volume and stripe sets), you can use -the kernel's Software RAID / MD driver. See section "Using Software RAID with -NTFS" for details. + +Features +======== + +- This is a complete rewrite of the NTFS driver that used to be in the kernel. + This new driver implements NTFS read support and is functionally equivalent + to the old ntfs driver. +- The new driver has full support for sparse files on NTFS 3.x volumes which + the old driver isn't happy with. +- The new driver supports execution of binaries due to mmap() now being + supported. +- The new driver supports loopback mounting of files on NTFS which is used by + some Linux distributions to enable the user to run Linux from an NTFS + partition by creating a large file while in Windows and then loopback + mounting the file while in Linux and creating a Linux filesystem on it that + is used to install Linux on it. +- A comparison of the two drivers using: + time find . -type f -exec md5sum "{}" \; + run three times in sequence with each driver (after a reboot) on a 1.4GiB + NTFS partition, showed the new driver to be 20% faster in total time elapsed + (from 9:43 minutes on average down to 7:53). The time spent in user space + was unchanged but the time spent in the kernel was decreased by a factor of + 2.5 (from 85 CPU seconds down to 33). +- The driver does not support short file names in general. For backwards + compatibility, we implement access to files using their short file names if + they exist. The driver will not create short file names however, and a rename + will discard any existing short file name. Supported mount options @@ -33,31 +80,31 @@ In addition to the generic mount options described by the manual page for the mount command (man 8 mount, also see man 5 fstab), the NTFS driver supports the following mount options: -iocharset=name Deprecated option. Still supported but please use - nls=name in the future. See description for nls=name. +iocharset=name Deprecated option. Still supported but please use + nls=name in the future. See description for nls=name. nls=name Character set to use when returning file names. Unlike VFAT, NTFS suppresses names that contain - unconvertible characters. Note that most character + unconvertible characters. Note that most character sets contain insufficient characters to represent all - possible Unicode characters that can exist on NTFS. To - be sure you are not missing any files, you are advised - to use nls=utf8 which is capable of representing all - Unicode characters. + possible Unicode characters that can exist on NTFS. + To be sure you are not missing any files, you are + advised to use nls=utf8 which is capable of + representing all Unicode characters. -utf8=<bool> Option no longer supported. Currently mapped to +utf8=<bool> Option no longer supported. Currently mapped to nls=utf8 but please use nls=utf8 in the future and make sure utf8 is compiled either as module or into - the kernel. See description for nls=name. + the kernel. See description for nls=name. uid= gid= umask= Provide default owner, group, and access mode mask. - These options work as documented in mount(8). By + These options work as documented in mount(8). By default, the files/directories are owned by root and he/she has read and write permissions, as well as - browse permission for directories. No one else has any - access permissions. I.e. the mode on all files is by + browse permission for directories. No one else has any + access permissions. I.e. the mode on all files is by default rw------- and for directories rwx------, a consequence of the default fmask=0177 and dmask=0077. Using a umask of zero will grant all permissions to @@ -74,7 +121,7 @@ sloppy=<BOOL> If sloppy is specified, ignore unknown mount options. any unknown options are found. show_sys_files=<BOOL> If show_sys_files is specified, show the system files - in directory listings. Otherwise the default behaviour + in directory listings. Otherwise the default behaviour is to hide the system files. Note that even when show_sys_files is specified, "$MFT" will not be visible due to bugs/mis-features in glibc. @@ -85,15 +132,15 @@ show_sys_files=<BOOL> If show_sys_files is specified, show the system files case_sensitive=<BOOL> If case_sensitive is specified, treat all file names as case sensitive and create file names in the POSIX - namespace. Otherwise the default behaviour is to treat + namespace. Otherwise the default behaviour is to treat file names as case insensitive and to create file names - in the WIN32/LONG name space. Note, the Linux NTFS + in the WIN32/LONG name space. Note, the Linux NTFS driver will never create short file names and will remove them on rename/delete of the corresponding long file name. Note that files remain accessible via their short file - name, if it exists. If case_sensitive, you will need to - provide the correct case of the short file name. + name, if it exists. If case_sensitive, you will need + to provide the correct case of the short file name. errors=opt What to do when critical file system errors are found. Following values can be used for "opt": @@ -102,27 +149,27 @@ errors=opt What to do when critical file system errors are found. bad so it is no longer accessed, and then continue. recover: At present only supported is recovery of - the boot sector from the backup copy. If a - read-only mount, the recovery is done in - memory only and not written to disk. + the boot sector from the backup copy. + If read-only mount, the recovery is done + in memory only and not written to disk. Note that the options are additive, i.e. specifying: errors=continue,errors=recover - This means the driver will attempt to recover and if - that fails it will clean-up as much as possible and + means the driver will attempt to recover and if that + fails it will clean-up as much as possible and continue. mft_zone_multiplier= Set the MFT zone multiplier for the volume (this setting is not persistent across mounts and can be changed from mount to mount but cannot be changed on - remount). Values of 1 to 4 are allowed, 1 being the - default. The MFT zone multiplier determines how much - space is reserved for the MFT on the volume. If all + remount). Values of 1 to 4 are allowed, 1 being the + default. The MFT zone multiplier determines how much + space is reserved for the MFT on the volume. If all other space is used up, then the MFT zone will be shrunk dynamically, so this has no impact on the - amount of free space. However, it can have an impact + amount of free space. However, it can have an impact on performance by affecting fragmentation of the MFT. - In general use the default. If you have a lot of small - files then use a higher value. The values have the + In general use the default. If you have a lot of small + files then use a higher value. The values have the following meaning: Value MFT zone size (% of volume size) 1 12.5% @@ -132,37 +179,14 @@ mft_zone_multiplier= Set the MFT zone multiplier for the volume (this Note this option is irrelevant for read-only mounts. -Features -======== - -- This is a complete rewrite of the NTFS driver that used to be in the kernel. - This new driver implements NTFS read support and is functionally equivalent - to the old ntfs driver. -- The new driver has full support for sparse files on NTFS 3.x volumes which - the old driver isn't happy with. -- The new driver supports execution of binaries due to mmap() now being - supported. -- A comparison of the two drivers using: - time find . -type f -exec md5sum "{}" \; - run three times in sequence with each driver (after a reboot) on a 1.4GiB - NTFS partition, showed the new driver to be 20% faster in total time elapsed - (from 9:43 minutes on average down to 7:53). The time spent in user space - was unchanged but the time spent in the kernel was decreased by a factor of - 2.5 (from 85 CPU seconds down to 33). -- The driver does not support short file names in general. For backwards - compatibility, we implement access to files using their short file names if - they exist. The driver will not create short file names however, and a rename - will discard any existing short file name. - - Known bugs and (mis-)features ============================= - The link count on each directory inode entry is set to 1, due to Linux not - supporting directory hard links. This may well confuse some user space + supporting directory hard links. This may well confuse some user space applications, since the directory names will have the same inode numbers. - This also speeds up ntfs_read_inode() immensely. And we haven't found any - problems with this approach so far. If you find a problem with this, please + This also speeds up ntfs_read_inode() immensely. And we haven't found any + problems with this approach so far. If you find a problem with this, please let us know. @@ -176,11 +200,11 @@ Using Software RAID with NTFS For support of volume and stripe sets, use the kernel's Software RAID / MD driver and set up your /etc/raidtab appropriately (see man 5 raidtab). -Linear volume sets, i.e. linear raid, as well as stripe sets, i.e. raid level 0, -have been tested and work fine (though see section "Limitiations when using the -MD driver with NTFS volumes" especially if you want to use linear raid). Even -though untested, there is no reason why mirrors, i.e. raid level 1, and stripes -with parity, i.e. raid level 5, should not work, too. +Linear volume sets, i.e. linear raid, as well as stripe sets, i.e. raid level +0, have been tested and work fine (though see section "Limitiations when using +the MD driver with NTFS volumes" especially if you want to use linear raid). +Even though untested, there is no reason why mirrors, i.e. raid level 1, and +stripes with parity, i.e. raid level 5, should not work, too. You have to use the "persistent-superblock 0" option for each raid-disk in the NTFS volume/stripe you are configuring in /etc/raidtab as the persistent @@ -207,15 +231,16 @@ For linear raid, just change the raid-level above to "raid-level linear", for mirrors, change it to "raid-level 1", and for stripe sets with parity, change it to "raid-level 5". -Note for stripe sets with parity you will also need to tell the MD driver which -parity algorithm to use by specifying the option "parity-algorithm which", -where you need to replace "which" with the name of the algorithm to use (see -man 5 raidtab for available algorithms) and you will have to try the different -available algorithms until you find one that works. Make sure you are working -read-only when playing with this as you may damage your data otherwise. If you -find which algorithm works please let us know (email the linux-ntfs developers -list linux-ntfs-dev@lists.sourceforge.net or drop in on IRC in channel #ntfs -on the irc.openprojects.net network) so we can update this documentation. +Note for stripe sets with parity you will also need to tell the MD driver +which parity algorithm to use by specifying the option "parity-algorithm +which", where you need to replace "which" with the name of the algorithm to +use (see man 5 raidtab for available algorithms) and you will have to try the +different available algorithms until you find one that works. Make sure you +are working read-only when playing with this as you may damage your data +otherwise. If you find which algorithm works please let us know (email the +linux-ntfs developers list linux-ntfs-dev@lists.sourceforge.net or drop in on +IRC in channel #ntfs on the irc.freenode.net network) so we can update this +documentation. Once the raidtab is setup, run for example raid0run -a to start all devices or raid0run /dev/md0 to start a particular md device, in this case /dev/md0. @@ -232,14 +257,14 @@ Limitiations when using the MD driver ===================================== Using the md driver will not work properly if any of your NTFS partitions have -an odd number of sectors. This is especially important for linear raid as all +an odd number of sectors. This is especially important for linear raid as all data after the first partition with an odd number of sectors will be offset by one or more sectors so if you mount such a partition with write support you will cause massive damage to the data on the volume which will only become apparent when you try to use the volume again under Windows. So when using linear raid, make sure that all your partitions have an even -number of sectors BEFORE attempting to use it. You have been warned! +number of sectors BEFORE attempting to use it. You have been warned! ChangeLog diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4d1898180b6e..0500b1d91974 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -532,10 +532,8 @@ config APM 11) exchange RAM chips 12) exchange the motherboard. - To compile this driver as a module ( = code which can be inserted in - and removed from the running kernel whenever you want), say M here - and read <file:Documentation/modules.txt>. The module will be called - apm. + To compile this driver as a module, choose M here: the + module will be called apm. config ARTHUR tristate "RISC OS personality" diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index 9865061a62f2..e0479f67e797 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig @@ -8,9 +8,7 @@ config INTEGRATOR_IMPD1 allows ARM(R) Ltd PrimeCells to be developed and evaluated. The IM-PD1 can be found on the Integrator/PP2 platform. - If you want to compile this as a module (=code which can be - inserted into and removed from the running kernel), say M - here and read <file:Documentation/modules.txt>. The module - will be called impd1. + To compile this driver as a module, choose M here: the + module will be called impd1. endmenu diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 9e139bc1a83e..c3d93c292183 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -595,11 +595,9 @@ config MICROCODE ingredients for this driver, check: <http://www.urbanmyth.org/microcode/>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called microcode. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. If - you use modprobe or kmod you may also want to add the line + To compile this driver as a module, choose M here: the + module will be called microcode. + If you use modprobe or kmod you may also want to add the line 'alias char-major-10-184 microcode' to your /etc/modules.conf file. config X86_MSR @@ -867,10 +865,8 @@ config APM 11) exchange RAM chips 12) exchange the motherboard. - To compile this driver as a module ( = code which can be inserted in - and removed from the running kernel whenever you want), say M here - and read <file:Documentation/modules.txt>. The module will be called - apm. + To compile this driver as a module, choose M here: the + module will be called apm. config APM_IGNORE_USER_SUSPEND bool "Ignore USER SUSPEND" diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c index e19e3bab3cf4..a3569664793e 100644 --- a/arch/i386/kernel/dmi_scan.c +++ b/arch/i386/kernel/dmi_scan.c @@ -205,7 +205,7 @@ struct dmi_blacklist /* * Reboot options and system auto-detection code provided by - * Dell Computer Corporation so their systems "just work". :-) + * Dell Inc. so their systems "just work". :-) */ /* diff --git a/arch/i386/kernel/edd.c b/arch/i386/kernel/edd.c index 78a1a5846af9..8da3658509a3 100644 --- a/arch/i386/kernel/edd.c +++ b/arch/i386/kernel/edd.c @@ -1,6 +1,6 @@ /* * linux/arch/i386/kernel/edd.c - * Copyright (C) 2002, 2003 Dell Computer Corporation + * Copyright (C) 2002, 2003 Dell Inc. * by Matt Domsch <Matt_Domsch@dell.com> * * BIOS Enhanced Disk Drive Services (EDD) diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index b98ff5045104..7986b6d52b74 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -6,7 +6,7 @@ * Copyright (C) 2003 Hewlett-Packard Co * David Mosberger-Tang <davidm@hpl.hp.com> * - * Copyright (C) 2002 Dell Computer Corporation + * Copyright (C) 2002 Dell Inc. * Copyright (C) Matt Domsch (Matt_Domsch@dell.com) * * Copyright (C) 2002 Intel diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 11566d62e86d..821fbeac65d0 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -67,11 +67,8 @@ config PCMCIA for location). Please also read the PCMCIA-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - When compiled this way, there will be modules called pcmcia_core - and ds. If you want to compile it as a module, say M here and - read <file:Documentation/modules.txt>. + To compile this driver as modules, choose M here: the + modules will be called pcmcia_core and ds. config AMIGA bool "Amiga support" @@ -425,13 +422,11 @@ config PARPORT It is possible to share a single parallel port among several devices and it is safe to compile all the corresponding drivers into the - kernel. If you want to compile parallel port support as a module - ( = code which can be inserted in and removed from the running - kernel whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called - parport. If you have more than one parallel port and want to - specify which port and IRQ to be used by this driver at module load - time, take a look at <file:Documentation/parport.txt>. + kernel. To compile parallel port support as a module, choose M here: + the module will be called parport. + If you have more than one parallel port and want to specify which + port and IRQ to be used by this driver at module load time, take a + look at <file:Documentation/parport.txt>. If unsure, say Y. @@ -460,11 +455,8 @@ config PARPORT_PC PC compatible computers and some Alphas have PC-style parallel ports. - This code is also available as a module. If you want to compile it - as a module ( = code which can be inserted in and removed from the - running kernel whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called - parport_pc. + To compile this driver as a module, choose M here: the + module will be called parport_pc. If unsure, say Y. @@ -488,10 +480,8 @@ config PRINTER It is possible to share one parallel port among several devices (e.g. printer and ZIP drive) and it is safe to compile the - corresponding drivers into the kernel. If you want to compile this - driver as a module however ( = code which can be inserted in and - removed from the running kernel whenever you want), say M here and - read <file:Documentation/modules.txt> and + corresponding drivers into the kernel. + To compile this driver as a module, choose M here and read <file:Documentation/parport.txt>. The module will be called lp. If you have several parallel ports, you can specify which ports to @@ -571,9 +561,8 @@ config SERIAL serial port drivers do not need this driver built in for them to work.) - If you want to compile this driver as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - serial. + To compile this driver as a module, choose M here: the + module will be called serial. [WARNING: Do not compile this driver as a module if you are using non-standard serial ports, since the configuration information will be lost when the driver is unloaded. This limitation may be lifted @@ -717,10 +706,8 @@ config NVRAM On Atari machines, /dev/nvram is always configured and does not need to be selected. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called nvram. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called nvram. config ATARI_MFPSER tristate "Atari MFP serial support" @@ -730,10 +717,7 @@ config ATARI_MFPSER Linux, say Y. The driver equally supports all kinds of MFP serial ports and automatically detects whether Serial1 is available. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. Note for Falcon users: You also have an MFP port, it's just not wired to the outside... But you could use the port under Linux. @@ -748,10 +732,7 @@ config ATARI_SCC two connectors for channel A (Serial2 and LAN), they are visible as two separate devices. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config ATARI_SCC_DMA bool "Atari SCC serial DMA support" @@ -769,10 +750,7 @@ config ATARI_MIDI help If you want to use your Atari's MIDI port in Linux, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config ATARI_DSP56K tristate "Atari DSP56k support (EXPERIMENTAL)" @@ -782,10 +760,7 @@ config ATARI_DSP56K driver is still experimental, and if you don't know what it is, or if you don't have this processor, just say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config AMIGA_BUILTIN_SERIAL tristate "Amiga builtin serial support" @@ -794,10 +769,7 @@ config AMIGA_BUILTIN_SERIAL If you want to use your Amiga's built-in serial port in Linux, answer Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config WHIPPET_SERIAL tristate "Hisoft Whippet PCMCIA serial support" @@ -813,10 +785,7 @@ config MULTIFACE_III_TTY If you want to use a Multiface III card's serial port in Linux, answer Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config A2232 tristate "Commodore A2232 serial support (EXPERIMENTAL)" @@ -832,8 +801,7 @@ config A2232 This driver can be built as a module; but then "generic_serial" will also be built as a module. This has to be loaded before - "ser_a2232". If you want to do this, answer M here and read - "<file:Documentation/modules.txt>". + "ser_a2232". If you want to do this, answer M here. config GVPIOEXT tristate "GVP IO-Extender support" @@ -1086,11 +1054,8 @@ config SOFT_WATCHDOG from some situations that the hardware watchdog will recover from. Equally it's a lot cheaper to install. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - softdog. + To compile this driver as a module, choose M here: the + module will be called softdog. config GEN_RTC tristate "Generic /dev/rtc emulation" if !SUN3 @@ -1107,12 +1072,9 @@ config GEN_RTC for RTC_UIE which is required by some programs and may improve precision in some cases. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called genrtc. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. To load the - module automatically add 'alias char-major-10-135 genrtc' to your - /etc/modules.conf + To compile this driver as a module, choose M here: the + module will be called genrtc. To load the module automatically + add 'alias char-major-10-135 genrtc' to your /etc/modules.conf config GEN_RTC_X bool "Extended RTC operation" diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 4e2411ecb63d..e3e60d977cd8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1272,12 +1272,10 @@ config SOUND If you have a PnP sound card and you want to configure it at boot time using the ISA PnP tools (read <http://www.roestock.demon.co.uk/isapnptools/>), then you need to - compile the sound card support as a module ( = code which can be - inserted in and removed from the running kernel whenever you want) - and load that module after the PnP configuration is finished. To do - this, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/sound/README.modules>; the module will be - called soundcore. + compile the sound card support as a module and load that module + after the PnP configuration is finished. To do this, choose M here + and read <file:Documentation/sound/README.modules>; the module + will be called soundcore. I'm told that even without a sound card, you can make your computer say more than an occasional beep, by programming the PC speaker. diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 28a2a1ff4e89..d06204b41228 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -849,10 +849,7 @@ config AMIGA_BUILTIN_SERIAL If you want to use your Amiga's built-in serial port in Linux, answer Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config GVPIOEXT tristate "GVP IO-Extender support" @@ -882,10 +879,7 @@ config MULTIFACE_III_TTY If you want to use a Multiface III card's serial port in Linux, answer Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config A2232 tristate "Commodore A2232 serial support (EXPERIMENTAL)" @@ -901,8 +895,7 @@ config A2232 This driver can be built as a module; but then "generic_serial" will also be built as a module. This has to be loaded before - "ser_a2232". If you want to do this, answer M here and read - "<file:Documentation/modules.txt>". + "ser_a2232". If you want to do this, answer M here. config WHIPPET_SERIAL tristate "Hisoft Whippet PCMCIA serial support" @@ -918,10 +911,8 @@ config APNE If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). The module is called apne. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called apne. config SERIAL_CONSOLE bool "Support for serial port console" diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index bda2bee57f99..f9f86dd0b5fb 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -166,10 +166,8 @@ config QDIO For details please refer to the documentation provided by IBM at <http://www10.software.ibm.com/developerworks/opensource/linux390> - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called qdio. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called qdio. If unsure, say Y. diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 27472a4e6ef6..24b9f3f97897 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -839,9 +839,8 @@ config SERIAL serial port drivers do not need this driver built in for them to work.) - If you want to compile this driver as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - serial. + To compile this driver as a module, choose M here: the + module will be called serial. [WARNING: Do not compile this driver as a module if you are using non-standard serial ports, since the configuration information will be lost when the driver is unloaded. This limitation may be lifted @@ -973,10 +972,8 @@ config PRINTER It is possible to share one parallel port among several devices (e.g. printer and ZIP drive) and it is safe to compile the - corresponding drivers into the kernel. If you want to compile this - driver as a module however ( = code which can be inserted in and - removed from the running kernel whenever you want), say M here and - read <file:Documentation/modules.txt> and + corresponding drivers into the kernel. + To compile this driver as a module, choose M here and read <file:Documentation/parport.txt>. The module will be called lp. If you have several parallel ports, you can specify which ports to @@ -1018,10 +1015,8 @@ config PPDEV It is safe to say N to this -- it is not needed for normal printing or parallel port CD-ROM/disk support. - This support is also available as a module. If you want to compile - it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - ppdev. + To compile this support as a module, choose M here: the + module will be called ppdev. If unsure, say N. @@ -1097,10 +1092,8 @@ config SH_WDT some performance issues. As such, the WDT should be avoided here unless it is absolutely necessary. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called shwdt. If you want to compile it as a module, - say M here and read Documentation/modules.txt. + To compile this driver as a module, choose M here: the + module will be called shwdt. endmenu @@ -1126,10 +1119,8 @@ config RTC sampling), then say Y here, and read <file:Documentation/rtc.txt> for details. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called rtc. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rtc. source "drivers/char/pcmcia/Kconfig" diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index e9874e031e3a..2aa9180b2422 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -162,11 +162,8 @@ config PCMCIA for location). Please also read the PCMCIA-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - When compiled this way, there will be modules called pcmcia_core - and ds. If you want to compile it as a module, say M here and - read <file:Documentation/modules.txt>. + To compile this driver as modules, choose M here: the + modules will be called pcmcia_core and ds. config SBUS bool @@ -248,11 +245,8 @@ config SUN_OPENPROMFS virtual file system, which you can mount to /proc/openprom by "mount -t openpromfs none /proc/openprom". - If you want to compile the /proc/openprom support as a module ( = - code which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. - The module will be called openpromfs. If unsure, say M. + To compile the /proc/openprom support as a module, choose M here: the + module will be called openpromfs. If unsure, choose M. source "fs/Kconfig.binfmt" @@ -280,9 +274,7 @@ config PRINTER It is possible to share one parallel port among several devices (e.g. printer and ZIP drive) and it is safe to compile the corresponding drivers into the kernel. If you want to compile this - driver as a module however ( = code which can be inserted in and - removed from the running kernel whenever you want), say M here and - read <file:Documentation/modules.txt> and + driver as a module however, choose M here and read <file:Documentation/parport.txt>. The module will be called lp. If you have several parallel ports, you can specify which ports to @@ -321,10 +313,8 @@ config BLK_DEV_FD well as location of the fdutils package used to configure additional parameters of the driver at run time. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called floppy. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called floppy. config BLK_DEV_LOOP tristate "Loopback device support" @@ -370,10 +360,8 @@ config BLK_DEV_LOOP Note that this loop device has nothing to do with the loopback device used for network connections from the machine to itself. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called loop. + To compile this driver as a module, choose M here: the + module will be called loop. Most users will answer N here. @@ -399,10 +387,8 @@ config BLK_DEV_NBD Note that this has nothing to do with the network file systems NFS or Coda; you can say N here even if you intend to use NFS or Coda. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called nbd. + To compile this driver as a module, choose M here: the + module will be called nbd. If unsure, say N. @@ -421,10 +407,8 @@ config BLK_DEV_RAM Note that the kernel command line option "ramdisk=XX" is now obsolete. For details, read <file:Documentation/ramdisk.txt>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M and read <file:Documentation/modules.txt>. The module will be - called rd. + To compile this driver as a module, choose M here: the + module will be called rd. Most normal users won't need the RAM disk functionality, and can thus say N here. @@ -534,11 +518,8 @@ config SOFT_WATCHDOG from some situations that the hardware watchdog will recover from. Equally it's a lot cheaper to install. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - softdog. + To compile this driver as a module, choose M here: the + module will be called softdog. endmenu diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index bcafb03c3fce..b36cbbad6807 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -230,10 +230,8 @@ config ISAPNP Say Y here if you would like support for ISA Plug and Play devices. Some information is in <file:Documentation/isapnp.txt>. - This support is also available as a module called isapnp ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called isapnp. If unsure, say Y. @@ -275,11 +273,8 @@ config PCMCIA for location). Please also read the PCMCIA-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - When compiled this way, there will be modules called pcmcia_core - and ds. If you want to compile it as a module, say M here and - read <file:Documentation/modules.txt>. + To compile this driver as modules, choose M here: the + modules will be called pcmcia_core and ds. config SBUS bool @@ -338,10 +333,8 @@ config RTC sampling), then say Y here, and read <file:Documentation/rtc.txt> for details. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called rtc. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rtc. source "drivers/pci/Kconfig" @@ -352,11 +345,8 @@ config SUN_OPENPROMFS virtual file system, which you can mount to /proc/openprom by "mount -t openpromfs none /proc/openprom". - If you want to compile the /proc/openprom support as a module ( = - code which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. - The module will be called openpromfs. If unsure, say M. + To compile the /proc/openprom support as a module, choose M here: the + module will be called openpromfs. If unsure, choose M. config SPARC32_COMPAT bool "Kernel support for Linux/Sparc 32bit binary compatibility" @@ -402,10 +392,8 @@ config SOLARIS_EMUL This is experimental code which will enable you to run (many) Solaris binaries on your SPARC Linux machine. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called solaris. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called solaris. source "drivers/parport/Kconfig" @@ -421,10 +409,8 @@ config PRINTER It is possible to share one parallel port among several devices (e.g. printer and ZIP drive) and it is safe to compile the - corresponding drivers into the kernel. If you want to compile this - driver as a module however ( = code which can be inserted in and - removed from the running kernel whenever you want), say M here and - read <file:Documentation/modules.txt> and + corresponding drivers into the kernel. + To compile this driver as a module, choose M here and read <file:Documentation/parport.txt>. The module will be called lp. If you have several parallel ports, you can specify which ports to @@ -443,10 +429,8 @@ config ENVCTRL Kernel support for temperature and fan monitoring on Sun SME machines. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called envctrl. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called envctrl. config DISPLAY7SEG tristate "7-Segment Display support" @@ -455,10 +439,8 @@ config DISPLAY7SEG This is the driver for the 7-segment display and LED present on Sun Microsystems CompactPCI models CP1400 and CP1500. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called display7seg. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called display7seg. If you do not have a CompactPCI model CP1400 or CP1500, or another UltraSPARC-IIi-cEngine boardset with a 7-segment display, @@ -471,10 +453,8 @@ config WATCHDOG_CP1XXX This is the driver for the hardware watchdog timers present on Sun Microsystems CompactPCI models CP1400 and CP1500. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cpwatchdog. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called cpwatchdog. If you do not have a CompactPCI model CP1400 or CP1500, or another UltraSPARC-IIi-cEngine boardset with hardware watchdog, @@ -513,10 +493,8 @@ config BLK_DEV_FD well as location of the fdutils package used to configure additional parameters of the driver at run time. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called floppy. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called floppy. config BLK_DEV_LOOP tristate "Loopback device support" @@ -562,10 +540,8 @@ config BLK_DEV_LOOP Note that this loop device has nothing to do with the loopback device used for network connections from the machine to itself. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called loop. + To compile this driver as a module, choose M here: the + module will be called loop. Most users will answer N here. @@ -591,10 +567,8 @@ config BLK_DEV_NBD Note that this has nothing to do with the network file systems NFS or Coda; you can say N here even if you intend to use NFS or Coda. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called nbd. + To compile this driver as a module, choose M here: the + module will be called nbd. If unsure, say N. @@ -613,10 +587,8 @@ config BLK_DEV_RAM Note that the kernel command line option "ramdisk=XX" is now obsolete. For details, read <file:Documentation/ramdisk.txt>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M and read <file:Documentation/modules.txt>. The module will be - called rd. + To compile this driver as a module, choose M here: the + module will be called rd. Most normal users won't need the RAM disk functionality, and can thus say N here. @@ -775,11 +747,8 @@ config SOFT_WATCHDOG from some situations that the hardware watchdog will recover from. Equally it's a lot cheaper to install. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - softdog. + To compile this driver as a module, choose M here: the + module will be called softdog. endmenu diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 1627ddc9513e..bfb063f51ce6 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -15,10 +15,8 @@ config BLK_DEV_FD well as location of the fdutils package used to configure additional parameters of the driver at run time. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called floppy. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called floppy. config AMIGA_FLOPPY tristate "Amiga floppy support" @@ -49,10 +47,8 @@ config BLK_DEV_PS2 Say Y here if you have a PS/2 machine with a MCA bus and an ESDI hard disk. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ps2esdi. + To compile this driver as a module, choose M here: the + module will be called ps2esdi. config AMIGA_Z2RAM tristate "Amiga Zorro II ramdisk support" @@ -60,11 +56,10 @@ config AMIGA_Z2RAM help This enables support for using Chip RAM and Zorro II RAM as a ramdisk or as a swap partition. Say Y if you want to include this - driver in the kernel. This driver is also available as a module - ( = code which can be inserted in and removed from the running - kernel whenever you want). The module is called z2ram. If you want - to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + driver in the kernel. + + To compile this driver as a module, choose M here: the + module will be called z2ram. config ATARI_ACSI tristate "Atari ACSI support" @@ -80,9 +75,8 @@ config ATARI_ACSI Ethernet, and PAMsNet Ethernet. If you want to use one of these devices, you need ACSI support, too. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called acsi. + To compile this driver as a module, choose M here: the + module will be called acsi. comment "Some devices (e.g. CD jukebox) support multiple LUNs" depends on ATARI && ATARI_ACSI @@ -116,10 +110,8 @@ config BLK_DEV_XD Very old 8 bit hard disk controllers used in the IBM XT computer will be supported if you say Y here. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called xd. + To compile this driver as a module, choose M here: the + module will be called xd. It's pretty unlikely that you have one of these: say N. @@ -195,10 +187,8 @@ config BLK_DEV_DAC960 <file:Documentation/README.DAC960> for further information about this driver. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called DAC960. + To compile this driver as a module, choose M here: the + module will be called DAC960. config BLK_DEV_UMEM tristate "Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)" @@ -211,10 +201,8 @@ config BLK_DEV_UMEM The cards appear as block devices that can be partitioned into as many as 15 partitions. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read Documentation/modules.txt. The module will be - called umem. + To compile this driver as a module, choose M here: the + module will be called umem. The umem driver has not yet been allocated a MAJOR number, so one is chosen dynamically. Use "devfs" or look in /proc/devices @@ -255,10 +243,8 @@ config BLK_DEV_LOOP Note that this loop device has nothing to do with the loopback device used for network connections from the machine to itself. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called loop. + To compile this driver as a module, choose M here: the + module will be called loop. Most users will answer N here. @@ -293,10 +279,8 @@ config BLK_DEV_NBD Note that this has nothing to do with the network file systems NFS or Coda; you can say N here even if you intend to use NFS or Coda. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called nbd. + To compile this driver as a module, choose M here: the + module will be called nbd. If unsure, say N. @@ -313,10 +297,8 @@ config BLK_DEV_RAM Note that the kernel command line option "ramdisk=XX" is now obsolete. For details, read <file:Documentation/ramdisk.txt>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M and read <file:Documentation/modules.txt>. The module will be - called rd. + To compile this driver as a module, choose M here: the + module will be called rd. Most normal users won't need the RAM disk functionality, and can thus say N here. diff --git a/drivers/cdrom/Kconfig b/drivers/cdrom/Kconfig index 7e31f190d0f6..7529ebb4821a 100644 --- a/drivers/cdrom/Kconfig +++ b/drivers/cdrom/Kconfig @@ -24,10 +24,7 @@ config CD_NO_IDESCSI file drivers/cdrom/{driver_name}.h where you can define your interface parameters and switch some internal goodies. - All these CD-ROM drivers are also usable as a module ( = code which - can be inserted in and removed from the running kernel whenever you - want). If you want to compile them as module, say M instead of Y and - read <file:Documentation/modules.txt>. + To compile these CD-ROM drivers as a module, choose M instead of Y. If you want to use any of these CD-ROM drivers, you also have to answer Y or M to "ISO 9660 CD-ROM file system support" below (this @@ -49,10 +46,8 @@ config AZTCD file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called aztcd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called aztcd. config GSCD tristate "Goldstar R420 CDROM support" @@ -67,10 +62,8 @@ config GSCD file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called gscd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called gscd. config SBPCD tristate "Matsushita/Panasonic/Creative, Longshine, TEAC CDROM support" @@ -107,10 +100,8 @@ config SBPCD file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sbpcd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called sbpcd. config MCD tristate "Mitsumi (standard) [no XA/Multisession] CDROM support" @@ -132,10 +123,8 @@ config MCD file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called mcd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called mcd. config MCD_IRQ int "MCD IRQ" @@ -173,10 +162,8 @@ config MCDX file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called mcdx. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called mcdx. config OPTCD tristate "Optics Storage DOLPHIN 8000AT CDROM support" @@ -192,10 +179,8 @@ config OPTCD file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called optcd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called optcd. config CM206 tristate "Philips/LMS CM206 CDROM support" @@ -209,10 +194,8 @@ config CM206 file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cm206. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called cm206. config SJCD tristate "Sanyo CDR-H94A CDROM support" @@ -223,10 +206,8 @@ config SJCD "ISO 9660 CD-ROM file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sjcd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called sjcd. config ISP16_CDI tristate "ISP16/MAD16/Mozart soft configurable cdrom interface support" @@ -238,10 +219,8 @@ config ISP16_CDI to a driver for the particular cdrom drive you have attached to the card. Read <file:Documentation/cdrom/isp16> for details. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called isp16. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called isp16. config CDU31A tristate "Sony CDU31A/CDU33A CDROM support" @@ -260,10 +239,8 @@ config CDU31A file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cdu31a. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called cdu31a. config CDU535 tristate "Sony CDU535 CDROM support" @@ -276,9 +253,7 @@ config CDU535 file system support" below, because that's the file system used on CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sonycd535. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called sonycd535. endmenu diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index fc416a29f75c..3074496ac6f5 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -90,10 +90,8 @@ config COMPUTONE order to become a dial-in server. If you have a card like that, say Y here and read <file:Documentation/computone.txt>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. You will get - two modules called ip2 and ip2main. + To compile this driver as modules, choose M here: the + modules will be called ip2 and ip2main. config ROCKETPORT tristate "Comtrol RocketPort support" @@ -104,9 +102,8 @@ config ROCKETPORT modems. For information about the RocketPort/RocketModem boards and this driver read <file:Documentation/rocket.txt>. - If you want to compile this driver as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - rocket. + To compile this driver as a module, choose M here: the + module will be called rocket. If you want to compile this driver into the kernel, say Y here. If you don't have a Comtrol RocketPort/RocketModem card installed, say N. @@ -124,10 +121,8 @@ config CYCLADES As of 1.3.9x kernels, this driver's minor numbers start at 0 instead of 32. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called cyclades. + To compile this driver as a module, choose M here: the + module will be called cyclades. If you haven't heard about it, it's safe to say N. @@ -159,8 +154,8 @@ config DIGIEPCA "Digiboard PC/Xx Support" below. You should (and can) only select one of the two drivers. - If you want to compile this driver as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called epca. + To compile this driver as a module, choose M here: the + module will be called epca. config DIGI tristate "Digiboard PC/Xx Support" @@ -172,8 +167,8 @@ config DIGI order to become a dial-in server. If you have a card like that, say Y here and read the file <file:Documentation/digiboard.txt>. - If you want to compile this driver as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called pcxx. + To compile this driver as a module, choose M here: the + module will be called pcxx. config ESPSERIAL tristate "Hayes ESP serial port support" @@ -183,10 +178,10 @@ config ESPSERIAL port cards and multiport cards are supported. Make sure to read <file:Documentation/hayes-esp.txt>. - To compile this driver as a module ( = code which can be inserted in - and removed from the running kernel whenever you want), say M here - and read <file:Documentation/modules.txt>. The module will be - called esp. If unsure, say N. + To compile this driver as a module, choose M here: the + module will be called esp. + + If unsure, say N. config MOXA_INTELLIO tristate "Moxa Intellio support" @@ -194,10 +189,8 @@ config MOXA_INTELLIO help Say Y here if you have a Moxa Intellio multiport serial card. - This driver can also be built as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called moxa. If you want to do that, say M - here. + To compile this driver as a module, choose M here: the + module will be called moxa. config MOXA_SMARTIO tristate "Moxa SmartIO support" @@ -216,10 +209,8 @@ config ISI help This is a driver for the Multi-Tech cards which provide several serial ports. The driver is experimental and can currently only be - built as a module ( = code which can be inserted in and removed from - the running kernel whenever you want). Please read - <file:Documentation/modules.txt>. The module will be called - isicom. + built as a module. The module will be called isicom. + If you want to do that, choose M here. config SYNCLINK tristate "Microgate SyncLink card support" @@ -345,10 +336,8 @@ config STALLION card, then this is for you; say Y. Make sure to read <file:Documentation/stallion.txt>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called stallion. + To compile this driver as a module, choose M here: the + module will be called stallion. config ISTALLION tristate "Stallion EC8/64, ONboard, Brumby support" @@ -358,10 +347,8 @@ config ISTALLION serial multiport card, say Y here. Make sure to read <file:Documentation/stallion.txt>. - To compile it as a module ( = code which can be inserted in and - removed from the running kernel whenever you want), say M here and - read <file:Documentation/modules.txt>. The module will be called - istallion. + To compile this driver as a module, choose M here: the + module will be called istallion. config SERIAL_TX3912 bool "TMPTX3912/PR31700 serial port support" @@ -437,8 +424,7 @@ config A2232 This driver can be built as a module; but then "generic_serial" will also be built as a module. This has to be loaded before - "ser_a2232". If you want to do this, answer M here and read - "<file:Documentation/modules.txt>". + "ser_a2232". If you want to do this, answer M here. source "drivers/serial/Kconfig" @@ -496,10 +482,9 @@ config PRINTER It is possible to share one parallel port among several devices (e.g. printer and ZIP drive) and it is safe to compile the - corresponding drivers into the kernel. If you want to compile this - driver as a module however ( = code which can be inserted in and - removed from the running kernel whenever you want), say M here and - read <file:Documentation/modules.txt> and + corresponding drivers into the kernel. + + To compile this driver as a module, choose M here and read <file:Documentation/parport.txt>. The module will be called lp. If you have several parallel ports, you can specify which ports to @@ -541,10 +526,8 @@ config PPDEV It is safe to say N to this -- it is not needed for normal printing or parallel port CD-ROM/disk support. - This support is also available as a module. If you want to compile - it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - ppdev. + To compile this driver as a module, choose M here: the + module will be called ppdev. If unsure, say N. @@ -561,10 +544,8 @@ config TIPAR to use this precise link cable (depending on the permissions on the device nodes, though). - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called tipar. If you want to compile it as a - module, say M here and read Documentation/modules.txt. + To compile this driver as a module, choose M here: the + module will be called tipar. If you don't know what a parallel link cable is or what a Texas Instruments graphing calculator is, then you probably don't need this @@ -612,21 +593,18 @@ config BUSMOUSE you will have to say Y here and also to the specific driver for your mouse below. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called busmouse. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called busmouse. endmenu config QIC02_TAPE tristate "QIC-02 tape support" help - If you have a non-SCSI tape drive like that, say Y. Or, if you want - to compile this driver as a module ( = code which can be inserted in - and removed from the running kernel whenever you want), say M here - and read <file:Documentation/modules.txt>. The module will be called - tpqic02. + If you have a non-SCSI tape drive like that, say Y. + + To compile this driver as a module, choose M here: the + module will be called tpqic02. config QIC02_DYNCONF bool "Do you want runtime configuration for QIC-02" @@ -687,11 +665,8 @@ config NWBUTTON button; it will still execute a hard reset if the button is held down for longer than approximately five seconds. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - nwbutton. + To compile this driver as a module, choose M here: the + module will be called nwbutton. Most people will answer Y to this question and "Reboot Using Button" below to be able to initiate a system shutdown from the button. @@ -718,10 +693,8 @@ config NWFLASH flash contents can render your computer unbootable. On no account allow random users access to this device. :-) - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called nwflash. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called nwflash. If you're not sure, say N. @@ -735,10 +708,8 @@ config HW_RANDOM Provides a character driver, used to read() entropy data. - To compile this driver as a module ( = code which can be inserted in - and removed from the running kernel whenever you want), say M here - and read <file:Documentation/modules.txt>. The module will be called - hw_random. + To compile this driver as a module, choose M here: the + module will be called hw_random. If unsure, say N. @@ -764,10 +735,8 @@ config NVRAM On Atari machines, /dev/nvram is always configured and does not need to be selected. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called nvram. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called nvram. config RTC tristate "Enhanced Real Time Clock Support" @@ -792,10 +761,8 @@ config RTC sampling), then say Y here, and read <file:Documentation/rtc.txt> for details. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called rtc. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rtc. config GEN_RTC tristate "Generic /dev/rtc emulation" @@ -812,12 +779,9 @@ config GEN_RTC for RTC_UIE which is required by some programs and may improve precision in some cases. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called genrtc. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. To load the - module automatically add 'alias char-major-10-135 genrtc' to your - /etc/modules.conf + To compile this driver as a module, choose M here: the + module will be called genrtc. To load the module automatically + add 'alias char-major-10-135 genrtc' to your /etc/modules.conf config GEN_RTC_X bool "Extended RTC operation" @@ -854,10 +818,10 @@ config DTLK help This driver is for the DoubleTalk PC, a speech synthesizer manufactured by RC Systems (<http://www.rcsys.com/>). It is also - called the `internal DoubleTalk'. If you want to compile this as a - module ( = code which can be inserted in and removed from the - running kernel whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called dtlk. + called the `internal DoubleTalk'. + + To compile this driver as a module, choose M here: the + module will be called dtlk. config R3964 tristate "Siemens R3964 line discipline" @@ -866,10 +830,8 @@ config R3964 Siemens R3964 packet protocol. Unless you are dealing with special hardware like PLCs, you are unlikely to need this. - To compile this driver as a module ( = code which can be inserted in - and removed from the running kernel whenever you want), say M here - and read <file:Documentation/modules.txt>. The module will be called - n_r3964. + To compile this driver as a module, choose M here: the + module will be called n_r3964. If unsure, say N. @@ -882,10 +844,8 @@ config APPLICOM <http://www.applicom-int.com/>, or by email from David Woodhouse <dwmw2@infradead.org>. - To compile this driver as a module ( = code which can be inserted in - and removed from the running kernel whenever you want), say M here - and read <file:Documentation/modules.txt>. The module will be called - applicom. + To compile this driver as a module, choose M here: the + module will be called applicom. If unsure, say N. @@ -899,10 +859,8 @@ config SONYPI If you have one of those laptops, read <file:Documentation/sonypi.txt>, and say Y or M here. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called sonypi. + To compile this driver as a module, choose M here: the + module will be called sonypi. menu "Ftape, the floppy tape device driver" @@ -931,9 +889,7 @@ config FTAPE please read the file <file:drivers/char/ftape/README.PCI>. The ftape kernel driver is also available as a runtime loadable - module ( = code which can be inserted in and removed from the - running kernel whenever you want). If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. The + module. To compile this driver as a module, choose M here: the module will be called ftape. Note that the Ftape-HOWTO is out of date (sorry) and documents the @@ -979,10 +935,8 @@ config MWAVE If you own one of the above IBM Thinkpads which has the Mwave chipset in it, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called mwave. If you want to compile it as - a module, say M here and read Documentation/modules.txt. + To compile this driver as a module, choose M here: the + module will be called mwave. config SCx200_GPIO tristate "NatSemi SCx200 GPIO Support" diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig index c00ae48223ea..45cc7e5b1b93 100644 --- a/drivers/char/agp/Kconfig +++ b/drivers/char/agp/Kconfig @@ -21,8 +21,7 @@ config AGP You should say Y here if you use XFree86 3.3.6 or 4.x and want to use GLX or DRI. If unsure, say N. - This driver is available as a module. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. The + To compile this driver as a module, choose M here: the module will be called agpgart. config AGP_ALI diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 2cfca61b9801..3030989e0869 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -784,6 +784,7 @@ extern void DRM(mem_init)(void); extern int DRM(mem_info)(char *buf, char **start, off_t offset, int request, int *eof, void *data); extern void *DRM(alloc)(size_t size, int area); +extern void *DRM(calloc)(size_t nmemb, size_t size, int area); extern void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size, int area); extern void DRM(free)(void *pt, size_t size, int area); diff --git a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h index c96e01e78dd1..658fc8ca76ae 100644 --- a/drivers/char/drm/drm_memory.h +++ b/drivers/char/drm/drm_memory.h @@ -117,10 +117,7 @@ agp_remap (unsigned long offset, unsigned long size, drm_device_t *dev) page_map[i] = pfn_to_page(phys_addr_map[i] >> PAGE_SHIFT); addr = vmap(page_map, num_pages, VM_IOREMAP, PAGE_AGP); vfree(page_map); - if (!addr) - return NULL; - flush_tlb_kernel_range((unsigned long) addr, (unsigned long) addr + size); return addr; } @@ -224,6 +221,18 @@ void *DRM(alloc)(size_t size, int area) return kmalloc(size, GFP_KERNEL); } +/** Wrapper around kmalloc() */ +void *DRM(calloc)(size_t size, size_t nmemb, int area) +{ + void *addr; + + addr = kmalloc(size * nmemb, GFP_KERNEL); + if (addr != NULL) + memset((void *)addr, 0, size * nmemb); + + return addr; +} + /** Wrapper around kmalloc() and kfree() */ void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size, int area) { diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h index 05a9fc2b3ee5..6354b56598fb 100644 --- a/drivers/char/drm/drm_memory_debug.h +++ b/drivers/char/drm/drm_memory_debug.h @@ -166,6 +166,17 @@ void *DRM(alloc)(size_t size, int area) return pt; } +void *DRM(calloc)(size_t size, size_t nmemb, int area) +{ + void *addr; + + addr = DRM(alloc)(nmemb * size, area); + if (addr != NULL) + memset((void *)addr, 0, size * nmemb); + + return addr; +} + void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size, int area) { void *pt; diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c index 7f65b110fce7..90c81344b5ab 100644 --- a/drivers/char/drm/i810_dma.c +++ b/drivers/char/drm/i810_dma.c @@ -83,7 +83,7 @@ static drm_buf_t *i810_freelist_get(drm_device_t *dev) /* In use is already a pointer */ used = cmpxchg(buf_priv->in_use, I810_BUF_FREE, I810_BUF_CLIENT); - if(used == I810_BUF_FREE) { + if (used == I810_BUF_FREE) { return buf; } } @@ -101,7 +101,7 @@ static int i810_freelist_put(drm_device_t *dev, drm_buf_t *buf) /* In use is already a pointer */ used = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, I810_BUF_FREE); - if(used != I810_BUF_CLIENT) { + if (used != I810_BUF_CLIENT) { DRM_ERROR("Freeing buffer thats not in use : %d\n", buf->idx); return -EINVAL; } @@ -154,7 +154,8 @@ static int i810_map_buffer(drm_buf_t *buf, struct file *filp) struct file_operations *old_fops; int retcode = 0; - if(buf_priv->currently_mapped == I810_BUF_MAPPED) return -EINVAL; + if (buf_priv->currently_mapped == I810_BUF_MAPPED) + return -EINVAL; down_write( ¤t->mm->mmap_sem ); old_fops = filp->f_op; @@ -182,7 +183,7 @@ static int i810_unmap_buffer(drm_buf_t *buf) drm_i810_buf_priv_t *buf_priv = buf->dev_private; int retcode = 0; - if(buf_priv->currently_mapped != I810_BUF_MAPPED) + if (buf_priv->currently_mapped != I810_BUF_MAPPED) return -EINVAL; down_write(¤t->mm->mmap_sem); @@ -212,7 +213,7 @@ static int i810_dma_get_buffer(drm_device_t *dev, drm_i810_dma_t *d, } retcode = i810_map_buffer(buf, filp); - if(retcode) { + if (retcode) { i810_freelist_put(dev, buf); DRM_ERROR("mapbuf failed, retcode %d\n", retcode); return retcode; @@ -244,7 +245,7 @@ int i810_dma_cleanup(drm_device_t *dev) drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; - if(dev_priv->ring.virtual_start) { + if (dev_priv->ring.virtual_start) { DRM(ioremapfree)((void *) dev_priv->ring.virtual_start, dev_priv->ring.Size, dev); } @@ -289,7 +290,7 @@ static int i810_wait_ring(drm_device_t *dev, int n) } iters++; - if(time_before(end, jiffies)) { + if (time_before(end, jiffies)) { DRM_ERROR("space: %d wanted %d\n", ring->space, n); DRM_ERROR("lockup\n"); goto out_wait_ring; @@ -319,7 +320,7 @@ static int i810_freelist_init(drm_device_t *dev, drm_i810_private_t *dev_priv) u32 *hw_status = (u32 *)(dev_priv->hw_status_page + my_idx); int i; - if(dma->buf_count > 1019) { + if (dma->buf_count > 1019) { /* Not enough space in the status page for the freelist */ return -EINVAL; } @@ -350,28 +351,28 @@ static int i810_dma_initialize(drm_device_t *dev, list_for_each(list, &dev->maplist->head) { drm_map_list_t *r_list = list_entry(list, drm_map_list_t, head); - if( r_list->map && + if (r_list->map && r_list->map->type == _DRM_SHM && r_list->map->flags & _DRM_CONTAINS_LOCK ) { dev_priv->sarea_map = r_list->map; break; } } - if(!dev_priv->sarea_map) { + if (!dev_priv->sarea_map) { dev->dev_private = (void *)dev_priv; i810_dma_cleanup(dev); DRM_ERROR("can not find sarea!\n"); return -EINVAL; } DRM_FIND_MAP( dev_priv->mmio_map, init->mmio_offset ); - if(!dev_priv->mmio_map) { + if (!dev_priv->mmio_map) { dev->dev_private = (void *)dev_priv; i810_dma_cleanup(dev); DRM_ERROR("can not find mmio map!\n"); return -EINVAL; } DRM_FIND_MAP( dev_priv->buffer_map, init->buffers_offset ); - if(!dev_priv->buffer_map) { + if (!dev_priv->buffer_map) { dev->dev_private = (void *)dev_priv; i810_dma_cleanup(dev); DRM_ERROR("can not find dma buffer map!\n"); @@ -431,7 +432,7 @@ static int i810_dma_initialize(drm_device_t *dev, DRM_DEBUG("Enabled hardware status page\n"); /* Now we need to init our freelist */ - if(i810_freelist_init(dev, dev_priv) != 0) { + if (i810_freelist_init(dev, dev_priv) != 0) { dev->dev_private = (void *)dev_priv; i810_dma_cleanup(dev); DRM_ERROR("Not enough space in the status page for" @@ -467,8 +468,8 @@ int i810_dma_init_compat(drm_i810_init_t *init, unsigned long arg) /* This is a v1.2 client, just get the v1.2 init data */ DRM_INFO("Using POST v1.2 init.\n"); - if(copy_from_user(init, (drm_i810_init_t *)arg, - sizeof(drm_i810_init_t))) { + if (copy_from_user(init, (drm_i810_init_t *)arg, + sizeof(drm_i810_init_t))) { return -EFAULT; } } else { @@ -496,7 +497,7 @@ int i810_dma_init(struct inode *inode, struct file *filp, int retcode = 0; /* Get only the init func */ - if (copy_from_user(&init, (void *)arg, sizeof(drm_i810_init_func_t))) + if (copy_from_user(&init, (void *)arg, sizeof(drm_i810_init_func_t))) return -EFAULT; switch(init.func) { @@ -513,9 +514,9 @@ int i810_dma_init(struct inode *inode, struct file *filp, dev_priv = DRM(alloc)(sizeof(drm_i810_private_t), DRM_MEM_DRIVER); if (dev_priv == NULL) - return -ENOMEM; + return -ENOMEM; retcode = i810_dma_initialize(dev, dev_priv, &init); - break; + break; default: case I810_INIT_DMA_1_4: @@ -526,15 +527,15 @@ int i810_dma_init(struct inode *inode, struct file *filp, } dev_priv = DRM(alloc)(sizeof(drm_i810_private_t), DRM_MEM_DRIVER); - if (dev_priv == NULL) - return -ENOMEM; + if (dev_priv == NULL) + return -ENOMEM; retcode = i810_dma_initialize(dev, dev_priv, &init); - break; + break; case I810_CLEANUP_DMA: DRM_INFO("DMA Cleanup\n"); retcode = i810_dma_cleanup(dev); - break; + break; } return retcode; @@ -1019,7 +1020,7 @@ void i810_reclaim_buffers(struct file *filp) if (used == I810_BUF_CLIENT) DRM_DEBUG("reclaimed from client\n"); - if(buf_priv->currently_mapped == I810_BUF_MAPPED) + if (buf_priv->currently_mapped == I810_BUF_MAPPED) buf_priv->currently_mapped = I810_BUF_UNMAPPED; } } @@ -1031,7 +1032,7 @@ int i810_flush_ioctl(struct inode *inode, struct file *filp, drm_file_t *priv = filp->private_data; drm_device_t *dev = priv->dev; - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_flush_ioctl called without lock held\n"); return -EINVAL; } @@ -1056,7 +1057,7 @@ int i810_dma_vertex(struct inode *inode, struct file *filp, if (copy_from_user(&vertex, (drm_i810_vertex_t *)arg, sizeof(vertex))) return -EFAULT; - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_dma_vertex called without lock held\n"); return -EINVAL; } @@ -1064,7 +1065,8 @@ int i810_dma_vertex(struct inode *inode, struct file *filp, DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n", vertex.idx, vertex.used, vertex.discard); - if(vertex.idx < 0 || vertex.idx > dma->buf_count) return -EINVAL; + if (vertex.idx < 0 || vertex.idx > dma->buf_count) + return -EINVAL; i810_dma_dispatch_vertex( dev, dma->buflist[ vertex.idx ], @@ -1090,7 +1092,7 @@ int i810_clear_bufs(struct inode *inode, struct file *filp, if (copy_from_user(&clear, (drm_i810_clear_t *)arg, sizeof(clear))) return -EFAULT; - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_clear_bufs called without lock held\n"); return -EINVAL; } @@ -1114,7 +1116,7 @@ int i810_swap_bufs(struct inode *inode, struct file *filp, DRM_DEBUG("i810_swap_bufs\n"); - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_swap_buf called without lock held\n"); return -EINVAL; } @@ -1152,7 +1154,7 @@ int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd, if (copy_from_user(&d, (drm_i810_dma_t *)arg, sizeof(d))) return -EFAULT; - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_dma called without lock held\n"); return -EINVAL; } @@ -1202,7 +1204,7 @@ static void i810_dma_dispatch_mc(drm_device_t *dev, drm_buf_t *buf, int used, u = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT, I810_BUF_HARDWARE); - if(u != I810_BUF_CLIENT) { + if (u != I810_BUF_CLIENT) { DRM_DEBUG("MC found buffer that isn't mine!\n"); } @@ -1266,7 +1268,7 @@ int i810_dma_mc(struct inode *inode, struct file *filp, return -EFAULT; - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_dma_mc called without lock held\n"); return -EINVAL; } @@ -1314,7 +1316,7 @@ int i810_fstatus(struct inode *inode, struct file *filp, drm_device_t *dev = priv->dev; drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private; - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_fstatus called without lock held\n"); return -EINVAL; } @@ -1328,7 +1330,7 @@ int i810_ov0_flip(struct inode *inode, struct file *filp, drm_device_t *dev = priv->dev; drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private; - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_ov0_flip called without lock held\n"); return -EINVAL; } @@ -1373,7 +1375,7 @@ int i810_flip_bufs(struct inode *inode, struct file *filp, DRM_DEBUG("%s\n", __FUNCTION__); - if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { + if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { DRM_ERROR("i810_flip_buf called without lock held\n"); return -EINVAL; } diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c index fc6caf7ba2ed..d0394a0c3e5e 100644 --- a/drivers/char/drm/r128_cce.c +++ b/drivers/char/drm/r128_cce.c @@ -81,8 +81,6 @@ static u32 r128_cce_microcode[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -int r128_do_wait_for_idle( drm_r128_private_t *dev_priv ); - int R128_READ_PLL(drm_device_t *dev, int addr) { drm_r128_private_t *dev_priv = dev->dev_private; @@ -151,7 +149,7 @@ static int r128_do_wait_for_fifo( drm_r128_private_t *dev_priv, int entries ) return DRM_ERR(EBUSY); } -int r128_do_wait_for_idle( drm_r128_private_t *dev_priv ) +static int r128_do_wait_for_idle( drm_r128_private_t *dev_priv ) { int i, ret; diff --git a/drivers/char/drm/radeon.h b/drivers/char/drm/radeon.h index 7df3dd743a3d..480991fe8936 100644 --- a/drivers/char/drm/radeon.h +++ b/drivers/char/drm/radeon.h @@ -68,19 +68,19 @@ * 1.5 - Add r200 packets to cmdbuf ioctl * - Add r200 function to init ioctl * - Add 'scalar2' instruction to cmdbuf - * 1.6 - Add static agp memory manager + * 1.6 - Add static GART memory manager * Add irq handler (won't be turned on unless X server knows to) * Add irq ioctls and irq_active getparam. * Add wait command for cmdbuf ioctl - * Add agp offset query for getparam + * Add GART offset query for getparam * 1.7 - Add support for cube map registers: R200_PP_CUBIC_FACES_[0..5] * and R200_PP_CUBIC_OFFSET_F1_[0..5]. * Added packets R200_EMIT_PP_CUBIC_FACES_[0..5] and * R200_EMIT_PP_CUBIC_OFFSETS_[0..5]. (brian) * 1.8 - Remove need to call cleanup ioctls on last client exit (keith) * Add 'GET' queries for starting additional clients on different VT's. - * Add DRM_IOCTL_RADEON_CP_RESUME ioctl. - * 1.9 - Add texture rectangle support for r100. + * 1.9 - Add DRM_IOCTL_RADEON_CP_RESUME ioctl. + * Add texture rectangle support for r100. */ #define DRIVER_IOCTLS \ [DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { radeon_cp_buffers, 1, 0 }, \ @@ -113,7 +113,7 @@ /* When a client dies: * - Check for and clean up flipped page state - * - Free any alloced agp memory. + * - Free any alloced GART memory. * * DRM infrastructure takes care of reclaiming dma buffers. */ @@ -124,7 +124,7 @@ do { \ if ( dev_priv->page_flipping ) { \ radeon_do_cleanup_pageflip( dev ); \ } \ - radeon_mem_release( filp, dev_priv->agp_heap ); \ + radeon_mem_release( filp, dev_priv->gart_heap ); \ radeon_mem_release( filp, dev_priv->fb_heap ); \ } \ } while (0) diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index cec9df593a7f..3e3618e3674d 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c @@ -855,25 +855,23 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev, /* Initialize the memory controller */ RADEON_WRITE( RADEON_MC_FB_LOCATION, - (dev_priv->agp_vm_start - 1) & 0xffff0000 ); + (dev_priv->gart_vm_start - 1) & 0xffff0000 ); +#if __REALLY_HAVE_AGP if ( !dev_priv->is_pci ) { RADEON_WRITE( RADEON_MC_AGP_LOCATION, - (((dev_priv->agp_vm_start - 1 + - dev_priv->agp_size) & 0xffff0000) | - (dev_priv->agp_vm_start >> 16)) ); - } + (((dev_priv->gart_vm_start - 1 + + dev_priv->gart_size) & 0xffff0000) | + (dev_priv->gart_vm_start >> 16)) ); -#if __REALLY_HAVE_AGP - if ( !dev_priv->is_pci ) ring_start = (dev_priv->cp_ring->offset - dev->agp->base - + dev_priv->agp_vm_start); - else + + dev_priv->gart_vm_start); + } else #endif ring_start = (dev_priv->cp_ring->offset - dev->sg->handle - + dev_priv->agp_vm_start); + + dev_priv->gart_vm_start); RADEON_WRITE( RADEON_CP_RB_BASE, ring_start ); @@ -891,7 +889,7 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev, RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR, dev_priv->ring_rptr->offset - dev->agp->base - + dev_priv->agp_vm_start); + + dev_priv->gart_vm_start); } else #endif { @@ -975,10 +973,36 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev, RADEON_ISYNC_CPSCRATCH_IDLEGUI) ); } +/* Enable or disable PCI GART on the chip */ +static void radeon_set_pcigart( drm_radeon_private_t *dev_priv, int on ) +{ + u32 tmp = RADEON_READ( RADEON_AIC_CNTL ); + + if ( on ) { + RADEON_WRITE( RADEON_AIC_CNTL, tmp | RADEON_PCIGART_TRANSLATE_EN ); + + /* set PCI GART page-table base address + */ + RADEON_WRITE( RADEON_AIC_PT_BASE, dev_priv->bus_pci_gart ); + + /* set address range for PCI address translate + */ + RADEON_WRITE( RADEON_AIC_LO_ADDR, dev_priv->gart_vm_start ); + RADEON_WRITE( RADEON_AIC_HI_ADDR, dev_priv->gart_vm_start + + dev_priv->gart_size - 1); + + /* Turn off AGP aperture -- is this required for PCI GART? + */ + RADEON_WRITE( RADEON_MC_AGP_LOCATION, 0xffffffc0 ); /* ?? */ + RADEON_WRITE( RADEON_AGP_COMMAND, 0 ); /* clear AGP_COMMAND */ + } else { + RADEON_WRITE( RADEON_AIC_CNTL, tmp & ~RADEON_PCIGART_TRANSLATE_EN ); + } +} + static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) { drm_radeon_private_t *dev_priv; - u32 tmp; DRM_DEBUG( "\n" ); dev_priv = DRM(alloc)( sizeof(drm_radeon_private_t), DRM_MEM_DRIVER ); @@ -1091,7 +1115,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) dev_priv->ring_offset = init->ring_offset; dev_priv->ring_rptr_offset = init->ring_rptr_offset; dev_priv->buffers_offset = init->buffers_offset; - dev_priv->agp_textures_offset = init->agp_textures_offset; + dev_priv->gart_textures_offset = init->gart_textures_offset; if(!dev_priv->sarea) { DRM_ERROR("could not find sarea!\n"); @@ -1136,11 +1160,10 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) return DRM_ERR(EINVAL); } - if ( !dev_priv->is_pci ) { - DRM_FIND_MAP( dev_priv->agp_textures, - init->agp_textures_offset ); - if(!dev_priv->agp_textures) { - DRM_ERROR("could not find agp texture region!\n"); + if ( init->gart_textures_offset ) { + DRM_FIND_MAP( dev_priv->gart_textures, init->gart_textures_offset ); + if ( !dev_priv->gart_textures ) { + DRM_ERROR("could not find GART texture region!\n"); dev->dev_private = (void *)dev_priv; radeon_do_cleanup_cp(dev); return DRM_ERR(EINVAL); @@ -1182,25 +1205,25 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) } - dev_priv->agp_size = init->agp_size; - dev_priv->agp_vm_start = RADEON_READ( RADEON_CONFIG_APER_SIZE ); + dev_priv->gart_size = init->gart_size; + dev_priv->gart_vm_start = RADEON_READ( RADEON_CONFIG_APER_SIZE ); #if __REALLY_HAVE_AGP if ( !dev_priv->is_pci ) - dev_priv->agp_buffers_offset = (dev_priv->buffers->offset + dev_priv->gart_buffers_offset = (dev_priv->buffers->offset - dev->agp->base - + dev_priv->agp_vm_start); + + dev_priv->gart_vm_start); else #endif - dev_priv->agp_buffers_offset = (dev_priv->buffers->offset + dev_priv->gart_buffers_offset = (dev_priv->buffers->offset - dev->sg->handle - + dev_priv->agp_vm_start); + + dev_priv->gart_vm_start); - DRM_DEBUG( "dev_priv->agp_size %d\n", - dev_priv->agp_size ); - DRM_DEBUG( "dev_priv->agp_vm_start 0x%x\n", - dev_priv->agp_vm_start ); - DRM_DEBUG( "dev_priv->agp_buffers_offset 0x%lx\n", - dev_priv->agp_buffers_offset ); + DRM_DEBUG( "dev_priv->gart_size %d\n", + dev_priv->gart_size ); + DRM_DEBUG( "dev_priv->gart_vm_start 0x%x\n", + dev_priv->gart_vm_start ); + DRM_DEBUG( "dev_priv->gart_buffers_offset 0x%lx\n", + dev_priv->gart_buffers_offset ); dev_priv->ring.start = (u32 *)dev_priv->cp_ring->handle; dev_priv->ring.end = ((u32 *)dev_priv->cp_ring->handle @@ -1213,7 +1236,13 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK; - if ( dev_priv->is_pci ) { +#if __REALLY_HAVE_AGP + if ( !dev_priv->is_pci ) { + /* Turn off PCI GART */ + radeon_set_pcigart( dev_priv, 0 ); + } else +#endif + { if (!DRM(ati_pcigart_init)( dev, &dev_priv->phys_pci_gart, &dev_priv->bus_pci_gart)) { DRM_ERROR( "failed to init PCI GART!\n" ); @@ -1221,32 +1250,9 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) radeon_do_cleanup_cp(dev); return DRM_ERR(ENOMEM); } - /* Turn on PCI GART - */ - tmp = RADEON_READ( RADEON_AIC_CNTL ) - | RADEON_PCIGART_TRANSLATE_EN; - RADEON_WRITE( RADEON_AIC_CNTL, tmp ); - - /* set PCI GART page-table base address - */ - RADEON_WRITE( RADEON_AIC_PT_BASE, dev_priv->bus_pci_gart ); - /* set address range for PCI address translate - */ - RADEON_WRITE( RADEON_AIC_LO_ADDR, dev_priv->agp_vm_start ); - RADEON_WRITE( RADEON_AIC_HI_ADDR, dev_priv->agp_vm_start - + dev_priv->agp_size - 1); - - /* Turn off AGP aperture -- is this required for PCIGART? - */ - RADEON_WRITE( RADEON_MC_AGP_LOCATION, 0xffffffc0 ); /* ?? */ - RADEON_WRITE( RADEON_AGP_COMMAND, 0 ); /* clear AGP_COMMAND */ - } else { - /* Turn off PCI GART - */ - tmp = RADEON_READ( RADEON_AIC_CNTL ) - & ~RADEON_PCIGART_TRANSLATE_EN; - RADEON_WRITE( RADEON_AIC_CNTL, tmp ); + /* Turn on PCI GART */ + radeon_set_pcigart( dev_priv, 1 ); } radeon_cp_load_microcode( dev_priv ); @@ -1304,162 +1310,30 @@ int radeon_do_cleanup_cp( drm_device_t *dev ) /* This code will reinit the Radeon CP hardware after a resume from disc. * AFAIK, it would be very difficult to pickle the state at suspend time, so * here we make sure that all Radeon hardware initialisation is re-done without - * affecting running applications. This function is called radeon_do_resume_cp() - * as it was derived from radeon_init_cp, where most of the initialisation takes - * place during DRI init. - * - * This patch is NOT to be confused with my and Michel Daenzer's earlier DRI - * reinit work, which de- and re-initialised the complete DRI at every VT - * switch. + * affecting running applications. * * Charl P. Botha <http://cpbotha.net> */ -static int radeon_do_resume_cp( drm_device_t *dev) +static int radeon_do_resume_cp( drm_device_t *dev ) { - drm_radeon_private_t *dev_priv; - u32 tmp; - DRM_DEBUG( "\n" ); - - DRM_DEBUG("Starting radeon_do_resume_cp()\n"); - - /* get the existing dev_private */ - dev_priv = dev->dev_private; - -#if !defined(PCIGART_ENABLED) - /* PCI support is not 100% working, so we disable it here. - */ - if ( dev_priv->is_pci ) { - DRM_ERROR( "PCI GART not yet supported for Radeon!\n" ); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } -#endif - - if ( dev_priv->is_pci && !dev->sg ) { - DRM_ERROR( "PCI GART memory not allocated!\n" ); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if ( dev_priv->usec_timeout < 1 || - dev_priv->usec_timeout > RADEON_MAX_USEC_TIMEOUT ) { - DRM_DEBUG( "TIMEOUT problem!\n" ); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if ( ( dev_priv->cp_mode != RADEON_CSQ_PRIBM_INDDIS ) && - ( dev_priv->cp_mode != RADEON_CSQ_PRIBM_INDBM ) ) { - DRM_DEBUG( "BAD cp_mode (%x)!\n", dev_priv->cp_mode ); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if(!dev_priv->sarea) { - DRM_ERROR("could not find sarea!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if(!dev_priv->fb) { - DRM_ERROR("could not find framebuffer!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if(!dev_priv->mmio) { - DRM_ERROR("could not find mmio region!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if(!dev_priv->cp_ring) { - DRM_ERROR("could not find cp ring region!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if(!dev_priv->ring_rptr) { - DRM_ERROR("could not find ring read pointer!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if(!dev_priv->buffers) { - DRM_ERROR("could not find dma buffer region!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - - if ( !dev_priv->is_pci ) { - if(!dev_priv->agp_textures) { - DRM_ERROR("could not find agp texture region!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - } + drm_radeon_private_t *dev_priv = dev->dev_private; - if ( !dev_priv->is_pci ) { - if(!dev_priv->cp_ring->handle || - !dev_priv->ring_rptr->handle || - !dev_priv->buffers->handle) { - DRM_ERROR("could not find ioremap agp regions!\n"); - radeon_do_cleanup_cp(dev); - return DRM_ERR(EINVAL); - } - } else { - DRM_DEBUG( "dev_priv->cp_ring->handle %p\n", - dev_priv->cp_ring->handle ); - DRM_DEBUG( "dev_priv->ring_rptr->handle %p\n", - dev_priv->ring_rptr->handle ); - DRM_DEBUG( "dev_priv->buffers->handle %p\n", - dev_priv->buffers->handle ); + if ( !dev_priv ) { + DRM_ERROR( "Called with no initialization\n" ); + return DRM_ERR( EINVAL ); } - - DRM_DEBUG( "dev_priv->agp_size %d\n", - dev_priv->agp_size ); - DRM_DEBUG( "dev_priv->agp_vm_start 0x%x\n", - dev_priv->agp_vm_start ); - DRM_DEBUG( "dev_priv->agp_buffers_offset 0x%lx\n", - dev_priv->agp_buffers_offset ); + DRM_DEBUG("Starting radeon_do_resume_cp()\n"); #if __REALLY_HAVE_AGP if ( !dev_priv->is_pci ) { - /* Turn off PCI GART - */ - tmp = RADEON_READ( RADEON_AIC_CNTL ) - & ~RADEON_PCIGART_TRANSLATE_EN; - RADEON_WRITE( RADEON_AIC_CNTL, tmp ); + /* Turn off PCI GART */ + radeon_set_pcigart( dev_priv, 0 ); } else #endif { - /* I'm not so sure about this ati_picgart_init after at resume-time... */ - if (!DRM(ati_pcigart_init)( dev, &dev_priv->phys_pci_gart, - &dev_priv->bus_pci_gart)) { - DRM_ERROR( "failed to init PCI GART!\n" ); - radeon_do_cleanup_cp(dev); - return DRM_ERR(ENOMEM); - } - - tmp = RADEON_READ( RADEON_AIC_CNTL ) - | RADEON_PCIGART_TRANSLATE_EN; - RADEON_WRITE( RADEON_AIC_CNTL, tmp ); - - /* set PCI GART page-table base address - */ - RADEON_WRITE( RADEON_AIC_PT_BASE, dev_priv->bus_pci_gart ); - - /* set address range for PCI address translate - */ - RADEON_WRITE( RADEON_AIC_LO_ADDR, dev_priv->agp_vm_start ); - RADEON_WRITE( RADEON_AIC_HI_ADDR, dev_priv->agp_vm_start - + dev_priv->agp_size - 1); - - /* Turn off AGP aperture -- is this required for PCIGART? - */ - RADEON_WRITE( RADEON_MC_AGP_LOCATION, 0xffffffc0 ); /* ?? */ - RADEON_WRITE( RADEON_AGP_COMMAND, 0 ); /* clear AGP_COMMAND */ + /* Turn on PCI GART */ + radeon_set_pcigart( dev_priv, 1 ); } radeon_cp_load_microcode( dev_priv ); @@ -1467,6 +1341,8 @@ static int radeon_do_resume_cp( drm_device_t *dev) radeon_do_engine_reset( dev ); + DRM_DEBUG("radeon_do_resume_cp() complete\n"); + return 0; } @@ -1584,7 +1460,7 @@ void radeon_do_release( drm_device_t *dev ) RADEON_WRITE( RADEON_GEN_INT_CNTL, 0 ); /* Free memory heap structures */ - radeon_mem_takedown( &(dev_priv->agp_heap) ); + radeon_mem_takedown( &(dev_priv->gart_heap) ); radeon_mem_takedown( &(dev_priv->fb_heap) ); /* deallocate kernel resources */ diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h index 22fba1719f6b..c4a7464907d3 100644 --- a/drivers/char/drm/radeon_drm.h +++ b/drivers/char/drm/radeon_drm.h @@ -214,11 +214,11 @@ typedef union { #define RADEON_NR_SAREA_CLIPRECTS 12 -/* There are 2 heaps (local/AGP). Each region within a heap is a +/* There are 2 heaps (local/GART). Each region within a heap is a * minimum of 64k, and there are at most 64 of them per heap. */ #define RADEON_LOCAL_TEX_HEAP 0 -#define RADEON_AGP_TEX_HEAP 1 +#define RADEON_GART_TEX_HEAP 1 #define RADEON_NR_TEX_HEAPS 2 #define RADEON_NR_TEX_REGIONS 64 #define RADEON_LOG_TEX_GRANULARITY 16 @@ -400,7 +400,7 @@ typedef struct drm_radeon_init { unsigned long sarea_priv_offset; int is_pci; int cp_mode; - int agp_size; + int gart_size; int ring_size; int usec_timeout; @@ -415,7 +415,7 @@ typedef struct drm_radeon_init { unsigned long ring_offset; unsigned long ring_rptr_offset; unsigned long buffers_offset; - unsigned long agp_textures_offset; + unsigned long gart_textures_offset; } drm_radeon_init_t; typedef struct drm_radeon_cp_stop { @@ -525,18 +525,18 @@ typedef struct drm_radeon_indirect { /* 1.3: An ioctl to get parameters that aren't available to the 3d * client any other way. */ -#define RADEON_PARAM_AGP_BUFFER_OFFSET 1 /* card offset of 1st agp buffer */ +#define RADEON_PARAM_GART_BUFFER_OFFSET 1 /* card offset of 1st GART buffer */ #define RADEON_PARAM_LAST_FRAME 2 #define RADEON_PARAM_LAST_DISPATCH 3 #define RADEON_PARAM_LAST_CLEAR 4 /* Added with DRM version 1.6. */ #define RADEON_PARAM_IRQ_NR 5 -#define RADEON_PARAM_AGP_BASE 6 /* card offset of agp base */ +#define RADEON_PARAM_GART_BASE 6 /* card offset of GART base */ /* Added with DRM version 1.8. */ #define RADEON_PARAM_REGISTER_HANDLE 7 /* for drmMap() */ #define RADEON_PARAM_STATUS_HANDLE 8 #define RADEON_PARAM_SAREA_HANDLE 9 -#define RADEON_PARAM_AGP_TEX_HANDLE 10 +#define RADEON_PARAM_GART_TEX_HANDLE 10 typedef struct drm_radeon_getparam { int param; @@ -545,14 +545,14 @@ typedef struct drm_radeon_getparam { /* 1.6: Set up a memory manager for regions of shared memory: */ -#define RADEON_MEM_REGION_AGP 1 -#define RADEON_MEM_REGION_FB 2 +#define RADEON_MEM_REGION_GART 1 +#define RADEON_MEM_REGION_FB 2 typedef struct drm_radeon_mem_alloc { int region; int alignment; int size; - int *region_offset; /* offset from start of fb or agp */ + int *region_offset; /* offset from start of fb or GART */ } drm_radeon_mem_alloc_t; typedef struct drm_radeon_mem_free { diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 63756479e6a1..fd23aa28e6ff 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h @@ -73,9 +73,9 @@ typedef struct drm_radeon_private { drm_radeon_ring_buffer_t ring; drm_radeon_sarea_t *sarea_priv; - int agp_size; - u32 agp_vm_start; - unsigned long agp_buffers_offset; + int gart_size; + u32 gart_vm_start; + unsigned long gart_buffers_offset; int cp_mode; int cp_running; @@ -130,7 +130,7 @@ typedef struct drm_radeon_private { unsigned long ring_offset; unsigned long ring_rptr_offset; unsigned long buffers_offset; - unsigned long agp_textures_offset; + unsigned long gart_textures_offset; drm_local_map_t *sarea; drm_local_map_t *fb; @@ -138,9 +138,9 @@ typedef struct drm_radeon_private { drm_local_map_t *cp_ring; drm_local_map_t *ring_rptr; drm_local_map_t *buffers; - drm_local_map_t *agp_textures; + drm_local_map_t *gart_textures; - struct mem_block *agp_heap; + struct mem_block *gart_heap; struct mem_block *fb_heap; /* SW interrupt */ diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c index c3cbd3a9f3f3..3a3bf011a741 100644 --- a/drivers/char/drm/radeon_mem.c +++ b/drivers/char/drm/radeon_mem.c @@ -1,4 +1,4 @@ -/* radeon_mem.c -- Simple agp/fb memory manager for radeon -*- linux-c -*- +/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*- * * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. * @@ -35,7 +35,7 @@ #include "radeon_drm.h" #include "radeon_drv.h" -/* Very simple allocator for agp memory, working on a static range +/* Very simple allocator for GART memory, working on a static range * already mapped into each client's address space. */ @@ -212,8 +212,8 @@ static struct mem_block **get_heap( drm_radeon_private_t *dev_priv, int region ) { switch( region ) { - case RADEON_MEM_REGION_AGP: - return &dev_priv->agp_heap; + case RADEON_MEM_REGION_GART: + return &dev_priv->gart_heap; case RADEON_MEM_REGION_FB: return &dev_priv->fb_heap; default: diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index baa632264f54..833f96981ba0 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c @@ -893,7 +893,7 @@ static void radeon_cp_dispatch_vertex( drm_device_t *dev, { drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; - int offset = dev_priv->agp_buffers_offset + buf->offset + prim->start; + int offset = dev_priv->gart_buffers_offset + buf->offset + prim->start; int numverts = (int)prim->numverts; int nbox = sarea_priv->nbox; int i = 0; @@ -966,7 +966,7 @@ static void radeon_cp_dispatch_indirect( drm_device_t *dev, buf->idx, start, end ); if ( start != end ) { - int offset = (dev_priv->agp_buffers_offset + int offset = (dev_priv->gart_buffers_offset + buf->offset + start); int dwords = (end - start + 3) / sizeof(u32); @@ -999,7 +999,7 @@ static void radeon_cp_dispatch_indices( drm_device_t *dev, { drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; - int offset = dev_priv->agp_buffers_offset + prim->offset; + int offset = dev_priv->gart_buffers_offset + prim->offset; u32 *data; int dwords; int i = 0; @@ -2159,8 +2159,8 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS ) DRM_DEBUG( "pid=%d\n", DRM_CURRENTPID ); switch( param.param ) { - case RADEON_PARAM_AGP_BUFFER_OFFSET: - value = dev_priv->agp_buffers_offset; + case RADEON_PARAM_GART_BUFFER_OFFSET: + value = dev_priv->gart_buffers_offset; break; case RADEON_PARAM_LAST_FRAME: dev_priv->stats.last_frame_reads++; @@ -2176,8 +2176,8 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS ) case RADEON_PARAM_IRQ_NR: value = dev->irq; break; - case RADEON_PARAM_AGP_BASE: - value = dev_priv->agp_vm_start; + case RADEON_PARAM_GART_BASE: + value = dev_priv->gart_vm_start; break; case RADEON_PARAM_REGISTER_HANDLE: value = dev_priv->mmio_offset; @@ -2189,8 +2189,8 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS ) /* The lock is the first dword in the sarea. */ value = (int)dev->lock.hw_lock; break; - case RADEON_PARAM_AGP_TEX_HANDLE: - value = dev_priv->agp_textures_offset; + case RADEON_PARAM_GART_TEX_HANDLE: + value = dev_priv->gart_textures_offset; break; default: return DRM_ERR(EINVAL); diff --git a/drivers/char/ftape/Kconfig b/drivers/char/ftape/Kconfig index df9f65e5de24..7d3ecb56a1bd 100644 --- a/drivers/char/ftape/Kconfig +++ b/drivers/char/ftape/Kconfig @@ -14,11 +14,8 @@ config ZFTAPE interface (i.e. the hardware independent part of the driver) has been moved to a separate module. - If you say M zftape will be compiled as a runtime loadable - module ( = code which can be inserted in and removed from the - running kernel whenever you want). In this case you should read - <file:Documentation/modules.txt>. The module will be called - zftape. + To compile this driver as a module, choose M here: the + module will be called zftape. Regardless of whether you say Y or M here, an additional runtime loadable module called `zft-compressor' which contains code to diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index f7906dec15f0..d425936b4989 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig @@ -46,11 +46,8 @@ config SOFT_WATCHDOG from some situations that the hardware watchdog will recover from. Equally it's a lot cheaper to install. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - softdog. + To compile this driver as a module, choose M here: the + module will be called softdog. config WDT tristate "WDT Watchdog timer" @@ -63,10 +60,8 @@ config WDT documentation of your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time). - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called wdt. + To compile this driver as a module, choose M here: the + module will be called wdt. config WDT_501 bool "WDT501 features" @@ -97,10 +92,8 @@ config WDTPCI boot loader (lilo or loadlin) about how to pass options to the kernel at boot time). - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called wdt_pci. + To compile this driver as a module, choose M here: the + module will be called wdt_pci. config WDT_501_PCI bool "WDT501-PCI features" @@ -124,10 +117,8 @@ config PCWATCHDOG hardware. Please read <file:Documentation/pcwd-watchdog.txt>. The PC watchdog cards can be ordered from <http://www.berkprod.com/>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called pcwd. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pcwd. Most people will say N. @@ -139,13 +130,12 @@ config ACQUIRE_WDT Board Computer produced by Acquire Inc (and others). This watchdog simply watches your kernel to make sure it doesn't freeze, and if it does, it reboots your computer after a certain amount of time. - This driver is like the WDT501 driver but for different hardware. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called acquirewdt. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. Most - people will say N. + + To compile this driver as a module, choose M here: the + module will be called acquirewdt. + + Most people will say N. config ADVANTECH_WDT tristate "Advantech SBC Watchdog Timer" @@ -187,10 +177,8 @@ config SA1100_WATCHDOG system when timeout is reached. NOTE, that once enabled, this timer cannot be disabled. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called sa1100_wdt. + To compile this driver as a module, choose M here: the + module will be called sa1100_wdt. config EUROTECH_WDT tristate "Eurotech CPU-1220/1410 Watchdog Timer" @@ -211,11 +199,10 @@ config IB700_WDT This driver is like the WDT501 driver but for slightly different hardware. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called ib700wdt. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. Most people - will say N. + To compile this driver as a module, choose M here: the + module will be called ib700wdt. + + Most people will say N. config I810_TCO tristate "Intel i8xx TCO timer / Watchdog" @@ -234,9 +221,8 @@ config I810_TCO machine. If this is the case you will get a kernel message like "i810tco init: failed to reset NO_REBOOT flag". - If you want to compile this as a module, say M and read - <file:Documentation/modules.txt>. The module will be called - i810-tco. + To compile this driver as a module, choose M here: the + module will be called i810-tco. config MIXCOMWD tristate "Mixcom Watchdog" @@ -247,11 +233,10 @@ config MIXCOMWD and if it does, it reboots your computer after a certain amount of time. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called mixcomwd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. Most - people will say N. + To compile this driver as a module, choose M here: the + module will be called mixcomwd. + + Most people will say N. config SCx200_WDT tristate "NatSemi SCx200 Watchdog" @@ -286,11 +271,10 @@ config W83877F_WDT and if it does, it reboots your computer after a certain amount of time. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called w83877f_wdt. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. Most - people will say N. + To compile this driver as a module, choose M here: the + module will be called w83877f_wdt. + + Most people will say N. config MACHZ_WDT tristate "ZF MachZ Watchdog" @@ -302,10 +286,8 @@ config MACHZ_WDT your kernel to make sure it doesn't freeze, and if it does, it reboots your computer after a certain amount of time. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called machzwd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called machzwd. config SC520_WDT tristate "AMD Elan SC520 processor Watchdog" @@ -340,11 +322,10 @@ config ALIM7101_WDT This is the driver for the hardware watchdog on the ALi M7101 PMU as used in the x86 Cobalt servers. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called alim7101_wdt. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. Most - people will say N. + To compile this driver as a module, choose M here: the + module will be called alim7101_wdt. + + Most people will say N. config ALIM1535_WDT tristate "ALi M1535 PMU Watchdog Timer" @@ -352,11 +333,10 @@ config ALIM1535_WDT ---help--- This is the driver for the hardware watchdog on the ALi M1535 PMU. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called alim1535_wdt. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. Most - people will say N. + To compile this driver as a module, choose M here: the + module will be called alim1535_wdt. + + Most people will say N. config SC1200_WDT tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog" @@ -367,11 +347,10 @@ config SC1200_WDT for power management purposes and can be used to power down the device during inactivity periods (includes interrupt activity monitoring). - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called sc1200wdt. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. Most - people will say N. + To compile this driver as a module, choose M here: the + module will be called sc1200wdt. + + Most people will say N. config WAFER_WDT tristate "ICP Wafer 5823 Single Board Computer Watchdog" @@ -380,20 +359,15 @@ config WAFER_WDT This is a driver for the hardware watchdog on the ICP Wafer 5823 Single Board Computer (and probably other similar models). - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - wafer5823wdt. + To compile this driver as a module, choose M here: the + module will be called wafer5823wdt. config CPU5_WDT tristate "SMA CPU5 Watchdog" depends on WATCHDOG ---help--- TBD. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called cpu5wdt. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called cpu5wdt. endmenu diff --git a/drivers/fc4/Kconfig b/drivers/fc4/Kconfig index 1062a7c09568..f00c02a13ed6 100644 --- a/drivers/fc4/Kconfig +++ b/drivers/fc4/Kconfig @@ -33,10 +33,8 @@ config FC4_SOC that if you have older firmware in the card, you'll need the microcode from the Solaris driver to make it work. - This support is also available as a module called soc ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this support as a module, choose M here: the module will + be called soc. config FC4_SOCAL tristate "Sun SOC+ (aka SOCAL)" @@ -48,10 +46,8 @@ config FC4_SOCAL Interface Board). You'll probably need the microcode from the Solaris driver to make it work. - This support is also available as a module called socal ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this support as a module, choose M here: the module will + be called socal. comment "FC4 targets" depends on FC4 @@ -62,10 +58,8 @@ config SCSI_PLUTO help If you never bought a disk array made by Sun, go with N. - This support is also available as a module called pluto ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this support as a module, choose M here: the module will + be called pluto. config SCSI_FCAL tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC32 || SPARC64 @@ -76,10 +70,8 @@ config SCSI_FCAL common is either A5000 array or internal disks in E[3-6]000 machines. - This support is also available as a module called fcal ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. If unsure, say N. + To compile this support as a module, choose M here: the module will + be called fcal. config SCSI_FCAL prompt "Generic FC-AL disk driver" diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 1dcd06f98144..fe26eec8a33d 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -43,10 +43,8 @@ config IDE number of user programs such as smart that can query the status of SMART parameters from disk drives. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ide. + To compile this driver as a module, choose M here: the + module will be called ide. For further information, please read <file:Documentation/ide.txt>. @@ -83,9 +81,7 @@ config BLK_DEV_IDE performance, look for the hdparm package at <ftp://ibiblio.org/pub/Linux/system/hardware/>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> and + To compile this driver as a module, choose M here and read <file:Documentation/ide.txt>. The module will be called ide-mod. Do not compile this driver as a module if your root file system (the one containing the directory /) is located on an IDE device. @@ -143,12 +139,12 @@ config BLK_DEV_IDEDISK the old hard disk driver instead, say Y. If you have an SCSI-only system, you can say N here. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ide-disk. Do not compile this driver as a module - if your root file system (the one containing the directory /) is - located on the IDE disk. If unsure, say Y. + To compile this driver as a module, choose M here: the + module will be called ide-disk. + Do not compile this driver as a module if your root file system + (the one containing the directory /) is located on the IDE disk. + + If unsure, say Y. config IDEDISK_MULTI_MODE bool "Use multi-mode by default" @@ -201,10 +197,8 @@ config BLK_DEV_IDECD with IDE/ATAPI CD-ROMs, so install LILO 16 or higher, available from <ftp://brun.dyndns.org/pub/linux/lilo/>. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ide-cd. + To compile this driver as a module, choose M here: the + module will be called ide-cd. config BLK_DEV_IDETAPE tristate "Include IDE/ATAPI TAPE support (EXPERIMENTAL)" @@ -226,10 +220,8 @@ config BLK_DEV_IDETAPE <file:drivers/ide/ide-tape.c> and <file:Documentation/ide.txt> files for usage information. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ide-tape.o. + To compile this driver as a module, choose M here: the + module will be called ide-tape. config BLK_DEV_IDEFLOPPY tristate "Include IDE/ATAPI FLOPPY support" @@ -250,10 +242,8 @@ config BLK_DEV_IDEFLOPPY other IDE devices, as "hdb" or "hdc", or something similar (check the boot messages with dmesg). - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ide-floppy. + To compile this driver as a module, choose M here: the + module will be called ide-floppy. config BLK_DEV_IDESCSI tristate "SCSI emulation support" diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index a2d18d9223c5..40457dd02da8 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig @@ -15,10 +15,8 @@ config IEEE1394 is the core support only, you will also need to select a driver for your IEEE 1394 adapter. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ieee1394. + To compile this driver as a module, choose M here: the + module will be called ieee1394. comment "Subsystem Options" depends on IEEE1394 @@ -64,10 +62,8 @@ config IEEE1394_PCILYNX Instruments PCILynx chip. Note: this driver is written for revision 2 of this chip and may not work with revision 0. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called pcilynx. + To compile this driver as a module, choose M here: the + module will be called pcilynx. # Non-maintained pcilynx options # if [ "$CONFIG_IEEE1394_PCILYNX" != "n" ]; then @@ -84,10 +80,8 @@ config IEEE1394_OHCI1394 use one of these chipsets. It should work with any OHCI-1394 compliant card, however. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ohci1394. + To compile this driver as a module, choose M here: the + module will be called ohci1394. comment "Protocol Drivers" depends on IEEE1394 @@ -128,10 +122,8 @@ config IEEE1394_DV1394 The user-space API for dv1394 is documented in dv1394.h. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called dv1394. + To compile this driver as a module, choose M here: the + module will be called dv1394. config IEEE1394_RAWIO tristate "Raw IEEE1394 I/O support" @@ -142,10 +134,8 @@ config IEEE1394_RAWIO direct communication of user programs with the IEEE 1394 bus and thus with the attached peripherals. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called raw1394. + To compile this driver as a module, choose M here: the + module will be called raw1394. config IEEE1394_CMP tristate "IEC61883-1 Plug support" @@ -154,10 +144,8 @@ config IEEE1394_CMP This option enables the Connection Management Procedures (IEC61883-1) driver, which implements input and output plugs. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called amdtp. + To compile this driver as a module, choose M here: the + module will be called cmp. config IEEE1394_AMDTP tristate "IEC61883-6 (Audio transmission) support" @@ -169,9 +157,7 @@ config IEEE1394_AMDTP The userspace interface is documented in amdtp.h. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called amdtp. + To compile this driver as a module, choose M here: the + module will be called amdtp. endmenu diff --git a/drivers/ieee1394/oui.db b/drivers/ieee1394/oui.db index 056797b2cd98..fec894c1f75d 100644 --- a/drivers/ieee1394/oui.db +++ b/drivers/ieee1394/oui.db @@ -1612,7 +1612,7 @@ 000658 Helmut Fischer GmbH & Co. KG 000659 EAL (Apeldoorn) B.V. 00065A Strix Systems -00065B Dell Computer Corp. +00065B Dell Inc. 00065C Malachite Technologies, Inc. 00065D Heidelberg Web Systems 00065E Photuris, Inc. @@ -3965,7 +3965,7 @@ 00B0C2 Cisco Systems, Inc. 00B0C7 Tellabs Operations, Inc. 00B0CE TECHNOLOGY RESCUE -00B0D0 Dell Computer Corp. +00B0D0 Dell Inc. 00B0DB Nextcell, Inc. 00B0DF Reliable Data Technology, Inc. 00B0E7 British Federal Ltd. @@ -4054,7 +4054,7 @@ 00C04C DEPARTMENT OF FOREIGN AFFAIRS 00C04D MITEC, INC. 00C04E COMTROL CORPORATION -00C04F DELL COMPUTER CORPORATION +00C04F Dell Inc. 00C050 TOYO DENKI SEIZO K.K. 00C051 ADVANCED INTEGRATION RESEARCH 00C052 BURR-BROWN diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 00c767e430fe..96fb7dc031c3 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -19,10 +19,8 @@ config INPUT If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called input. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called input. comment "Userland interfaces" @@ -39,10 +37,8 @@ config INPUT_MOUSEDEV If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called mousedev. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called mousedev. config INPUT_MOUSEDEV_PSAUX bool "Provide legacy /dev/psaux device" if EMBEDDED @@ -80,10 +76,8 @@ config INPUT_JOYDEV More information is available: <file:Documentation/input/joystick.txt> - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called joydev. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called joydev. config INPUT_TSDEV tristate "Touchscreen interface" @@ -95,10 +89,8 @@ config INPUT_TSDEV If unsure, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called tsdev. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called tsdev. config INPUT_TSDEV_SCREEN_X int "Horizontal screen resolution" @@ -117,10 +109,8 @@ config INPUT_EVDEV Say Y here if you want your input device events be accessible under char device 13:64+ - /dev/input/eventX in a generic way. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called evdev. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called evdev. config INPUT_EVBUG tristate "Event debugging" @@ -134,10 +124,8 @@ config INPUT_EVBUG If unsure, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called joydev. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called evbug. comment "Input I/O drivers" diff --git a/drivers/input/gameport/Kconfig b/drivers/input/gameport/Kconfig index d7beafd0a43f..708aa123b68a 100644 --- a/drivers/input/gameport/Kconfig +++ b/drivers/input/gameport/Kconfig @@ -16,10 +16,8 @@ config GAMEPORT If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called gameport. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called gameport. config SOUND_GAMEPORT tristate @@ -34,10 +32,8 @@ config GAMEPORT_NS558 If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ns558. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called ns558. config GAMEPORT_L4 tristate "PDPI Lightning 4 gamecard support" @@ -45,10 +41,8 @@ config GAMEPORT_L4 help Say Y here if you have a PDPI Lightning 4 gamecard. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called lightning. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called lightning. config GAMEPORT_EMU10K1 tristate "SB Live and Audigy gameport support" @@ -57,10 +51,8 @@ config GAMEPORT_EMU10K1 Say Y here if you have a SoundBlaster Live! or SoundBlaster Audigy card and want to use its gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called emu10k1-gp. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called emu10k1-gp. config GAMEPORT_VORTEX tristate "Aureal Vortex, Vortex 2 gameport support" @@ -69,10 +61,8 @@ config GAMEPORT_VORTEX Say Y here if you have an Aureal Vortex 1 or 2 card and want to use its gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called vortex. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called vortex. config GAMEPORT_FM801 tristate "ForteMedia FM801 gameport support" diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig index 7f7278e19ab6..1ae033888dc0 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -27,10 +27,8 @@ config JOYSTICK_ANALOG Please read the file <file:Documentation/input/joystick.txt> which contains more information. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called analog. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called analog. config JOYSTICK_A3D tristate "Assasin 3D and MadCatz Panther devices" @@ -39,10 +37,8 @@ config JOYSTICK_A3D Say Y here if you have an FPGaming or MadCatz controller using the A3D protocol over the PC gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called a3d. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called a3d. config JOYSTICK_ADI tristate "Logitech ADI digital joysticks and gamepads" @@ -51,10 +47,8 @@ config JOYSTICK_ADI Say Y here if you have a Logitech controller using the ADI protocol over the PC gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called adi. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called adi. config JOYSTICK_COBRA tristate "Creative Labs Blaster Cobra gamepad" @@ -62,10 +56,8 @@ config JOYSTICK_COBRA help Say Y here if you have a Creative Labs Blaster Cobra gamepad. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cobra. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called cobra. config JOYSTICK_GF2K tristate "Genius Flight2000 Digital joysticks and gamepads" @@ -74,10 +66,8 @@ config JOYSTICK_GF2K Say Y here if you have a Genius Flight2000 or MaxFighter digitally communicating joystick or gamepad. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called gf2k. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called gf2k. config JOYSTICK_GRIP tristate "Gravis GrIP joysticks and gamepads" @@ -86,10 +76,8 @@ config JOYSTICK_GRIP Say Y here if you have a Gravis controller using the GrIP protocol over the PC gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called grip. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called grip. config JOYSTICK_GRIP_MP tristate "Gravis GrIP MultiPort" @@ -98,10 +86,8 @@ config JOYSTICK_GRIP_MP Say Y here if you have the original Gravis GrIP MultiPort, a hub that connects to the gameport and you connect gamepads to it. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called grip_mp. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called grip_mp. config JOYSTICK_GUILLEMOT tristate "Guillemot joysticks and gamepads" @@ -110,10 +96,8 @@ config JOYSTICK_GUILLEMOT Say Y here if you have a Guillemot joystick using a digital protocol over the PC gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called guillemot. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called guillemot. config JOYSTICK_INTERACT tristate "InterAct digital joysticks and gamepads" @@ -122,10 +106,8 @@ config JOYSTICK_INTERACT Say Y here if you have an InterAct gameport or joystick communicating digitally over the gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called interact. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called interact. config JOYSTICK_SIDEWINDER tristate "Microsoft SideWinder digital joysticks and gamepads" @@ -134,10 +116,8 @@ config JOYSTICK_SIDEWINDER Say Y here if you have a Microsoft controller using the Digital Overdrive protocol over PC gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sidewinder. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called sidewinder. config JOYSTICK_TMDC tristate "ThrustMaster DirectConnect joysticks and gamepads" @@ -146,10 +126,8 @@ config JOYSTICK_TMDC Say Y here if you have a ThrustMaster controller using the DirectConnect (BSP) protocol over the PC gameport. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called tmdc. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called tmdc. source "drivers/input/joystick/iforce/Kconfig" @@ -161,10 +139,8 @@ config JOYSTICK_WARRIOR Say Y here if you have a Logitech WingMan Warrior joystick connected to your computer's serial port. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called warrior. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called warrior. config JOYSTICK_MAGELLAN tristate "LogiCad3d Magellan/SpaceMouse 6dof controllers" @@ -174,10 +150,8 @@ config JOYSTICK_MAGELLAN Say Y here if you have a Magellan or Space Mouse 6DOF controller connected to your computer's serial port. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called magellan. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called magellan. config JOYSTICK_SPACEORB tristate "SpaceTec SpaceOrb/Avenger 6dof controllers" @@ -187,10 +161,8 @@ config JOYSTICK_SPACEORB Say Y here if you have a SpaceOrb 360 or SpaceBall Avenger 6DOF controller connected to your computer's serial port. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called spaceorb. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called spaceorb. config JOYSTICK_SPACEBALL tristate "SpaceTec SpaceBall 6dof controllers" @@ -201,10 +173,8 @@ config JOYSTICK_SPACEBALL controller connected to your computer's serial port. For the SpaceBall 4000 USB model, use the USB HID driver. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called spaceball. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called spaceball. config JOYSTICK_STINGER tristate "Gravis Stinger gamepad" @@ -214,10 +184,8 @@ config JOYSTICK_STINGER Say Y here if you have a Gravis Stinger connected to one of your serial ports. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called stinger. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called stinger. config JOYSTICK_TWIDDLER tristate "Twiddler as a joystick" @@ -227,10 +195,8 @@ config JOYSTICK_TWIDDLER Say Y here if you have a Handykey Twiddler connected to your computer's serial port and want to use it as a joystick. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called twidjoy. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called twidjoy. config JOYSTICK_DB9 tristate "Multisystem, Sega Genesis, Saturn joysticks and gamepads" @@ -242,10 +208,8 @@ config JOYSTICK_DB9 For more information on how to use the driver please read <file:Documentation/input/joystick-parport.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called db9. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called db9. config JOYSTICK_GAMECON tristate "Multisystem, NES, SNES, N64, PSX joysticks and gamepads" @@ -258,10 +222,8 @@ config JOYSTICK_GAMECON For more information on how to use the driver please read <file:Documentation/input/joystick-parport.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called gamecon. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called gamecon. config JOYSTICK_TURBOGRAFX tristate "Multisystem joysticks via TurboGraFX device" @@ -272,10 +234,8 @@ config JOYSTICK_TURBOGRAFX Amstrad CPC joystick. For more information on how to use the driver please read <file:Documentation/input/joystick-parport.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called turbografx. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called turbografx. config JOYSTICK_AMIGA tristate "Amiga joysticks" @@ -284,10 +244,8 @@ config JOYSTICK_AMIGA Say Y here if you have an Amiga with a digital joystick connected to it. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called amijoy. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called amijoy. config INPUT_JOYDUMP tristate "Gameport data dumper" @@ -297,8 +255,6 @@ config INPUT_JOYDUMP log for debugging purposes. Say N if you are making a production configuration or aren't sure. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called joydump. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called joydump. diff --git a/drivers/input/joystick/iforce/Kconfig b/drivers/input/joystick/iforce/Kconfig index c0143823c073..8b0195748ad0 100644 --- a/drivers/input/joystick/iforce/Kconfig +++ b/drivers/input/joystick/iforce/Kconfig @@ -9,10 +9,8 @@ config JOYSTICK_IFORCE You also must choose at least one of the two options below. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called iforce. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called iforce. config JOYSTICK_IFORCE_USB bool "I-Force USB joysticks and wheels" diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index fa4c33278e4b..87474f8661e3 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -24,10 +24,8 @@ config KEYBOARD_ATKBD If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called atkbd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called atkbd. config KEYBOARD_SUNKBD tristate "Sun Type 4 and Type 5 keyboard support" @@ -38,10 +36,8 @@ config KEYBOARD_SUNKBD connected either to the Sun keyboard connector or to an serial (RS-232) port via a simple adapter. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sunkbd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called sunkbd. config KEYBOARD_XTKBD tristate "XT Keyboard support" @@ -53,10 +49,8 @@ config KEYBOARD_XTKBD parallel port keyboard adapter, you cannot connect it to the keyboard port on a PC that runs Linux. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called xtkbd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called xtkbd. config KEYBOARD_NEWTON tristate "Newton keyboard" @@ -65,10 +59,8 @@ config KEYBOARD_NEWTON help Say Y here if you have a Newton keyboard on a serial port. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called maple_keyb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called newtonkbd. config KEYBOARD_MAPLE tristate "Maple bus keyboard support" @@ -77,10 +69,8 @@ config KEYBOARD_MAPLE Say Y here if you have a DreamCast console running Linux and have a keyboard attached to its Maple bus. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called maple_keyb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called maple_keyb. config KEYBOARD_AMIGA tristate "Amiga keyboard" @@ -89,10 +79,8 @@ config KEYBOARD_AMIGA Say Y here if you are running Linux on any AMIGA and have a keyboard attached. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called amikbd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called amikbd. config KEYBOARD_98KBD tristate "NEC PC-9800 Keyboard support" @@ -102,8 +90,6 @@ config KEYBOARD_98KBD Say Y here if you want to use the NEC PC-9801/PC-9821 keyboard (or compatible) on your system. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called xtkbd.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called 98kbd. diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index abbc02a55047..16008a3eee8a 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -21,10 +21,8 @@ config INPUT_PCSPKR If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called pcspkr. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pcspkr. config INPUT_SPARCSPKR tristate "SPARC Speaker support" @@ -35,10 +33,8 @@ config INPUT_SPARCSPKR If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called pcspkr. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called sparcspkr. config INPUT_M68K_BEEP tristate "M68k Beeper support" @@ -55,10 +51,8 @@ config INPUT_UINPUT Say Y here if you want to support user level drivers for input subsystem accessible under char device 10:223 - /dev/input/uinput. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called uinput. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called uinput. config INPUT_GSC tristate "PA-RISC GSC PS/2 keyboard/mouse support" diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index 25bb551723e2..c0da37c36d28 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -24,10 +24,8 @@ config MOUSE_PS2 If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called psmouse. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called psmouse. config MOUSE_PS2_SYNAPTICS bool "Synaptics TouchPad" @@ -56,10 +54,8 @@ config MOUSE_SERIAL If unsure, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sermouse. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called sermouse. config MOUSE_INPORT tristate "InPort/MS/ATIXL busmouse" @@ -68,10 +64,8 @@ config MOUSE_INPORT Say Y here if you have an InPort, Microsoft or ATI XL busmouse. They are rather rare these days. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called inport. If you want to compile it as a - module, say M here and read <file.:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called inport. config MOUSE_ATIXL bool "ATI XL variant" @@ -86,10 +80,8 @@ config MOUSE_LOGIBM Say Y here if you have a Logitech busmouse. They are rather rare these days. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called logibm. If you want to compile it as a - module, say M here and read <file.:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called logibm. config MOUSE_PC110PAD tristate "IBM PC110 touchpad" @@ -98,10 +90,8 @@ config MOUSE_PC110PAD Say Y if you have the IBM PC-110 micro-notebook and want its touchpad supported. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called pc110pad. If you want to compile it as a - module, say M here and read <file.:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pc110pad. config MOUSE_MAPLE tristate "Maple bus mouse" @@ -110,10 +100,8 @@ config MOUSE_MAPLE Say Y if you have a DreamCast console and a mouse attached to its Maple bus. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called maplemouse. If you want to compile it as a - module, say M here and read <file.:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called maplemouse. config MOUSE_AMIGA tristate "Amiga mouse" @@ -122,10 +110,8 @@ config MOUSE_AMIGA Say Y here if you have an Amiga and want its native mouse supported by the kernel. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called amimouse. If you want to compile it as a - module, say M here and read <file.:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called amimouse. config MOUSE_RISCPC tristate "Acorn RiscPC mouse" @@ -134,10 +120,8 @@ config MOUSE_RISCPC Say Y here if you have the Acorn RiscPC computer and want its native mouse supported. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called rpcmouse. If you want to compile it as a - module, say M here and read <file.:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rpcmouse. config MOUSE_PC9800 tristate "NEC PC-9800 busmouse" @@ -146,8 +130,6 @@ config MOUSE_PC9800 Say Y here if you have NEC PC-9801/PC-9821 computer and want its native mouse supported. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called logibm.o. If you want to compile it as a - module, say M here and read <file.:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called 98busmouse. diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 30312bf387dc..eaed728f1a2a 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -13,10 +13,8 @@ config SERIO If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called serio. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called serio. config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 @@ -29,10 +27,8 @@ config SERIO_I8042 If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called i8042. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called i8042. config SERIO_SERPORT tristate "Serial port line discipline" @@ -46,10 +42,8 @@ config SERIO_SERPORT If unsure, say Y. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called serport. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called serport. config SERIO_CT82C710 tristate "ct82c710 Aux port controller" @@ -61,10 +55,8 @@ config SERIO_CT82C710 If unsure, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ct82c710. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called ct82c710. config SERIO_Q40KBD tristate "Q40 keyboard controller" @@ -81,10 +73,8 @@ config SERIO_PARKBD If unsure, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called parkbd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called parkbd. config SERIO_RPCKBD tristate "Acorn RiscPC keyboard controller" @@ -94,10 +84,8 @@ config SERIO_RPCKBD Say Y here if you have the Acorn RiscPC and want to use an AT keyboard connected to its keyboard controller. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called rpckbd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rpckbd. config SERIO_AMBAKMI tristate "AMBA KMI keyboard controller" @@ -114,10 +102,8 @@ config SERIO_98KBD Say Y here if you have the NEC PC-9801/PC-9821 and want to use its standard keyboard connected to its keyboard controller. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called rpckbd.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called 98kbd-io. config SERIO_PCIPS2 tristate "PCI PS/2 keyboard and PS/2 mouse controller" @@ -126,7 +112,5 @@ config SERIO_PCIPS2 Say Y here if you have a Mobility Docking station with PS/2 keyboard and mice ports. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called rpckbd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pcips2. diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index df6d96dffa5a..4a1e7d6ea821 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -19,10 +19,8 @@ config TOUCHSCREEN_BITSY If unsure, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called gunze. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called h3600_ts_input. config TOUCHSCREEN_GUNZE tristate "Gunze AHL-51S touchscreen" @@ -34,8 +32,6 @@ config TOUCHSCREEN_GUNZE If unsure, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called gunze. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called gunze. diff --git a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig index 4a82068a0931..ee7081582520 100644 --- a/drivers/isdn/sc/Kconfig +++ b/drivers/isdn/sc/Kconfig @@ -6,9 +6,8 @@ config ISDN_DRV_SC depends on ISDN && ISA help This enables support for the Spellcaster BRI ISDN boards. This - driver currently builds only in a modularized version ( = code which - can be inserted in and removed from the running kernel whenever you - want, details in <file:Documentation/modules.txt>); the module will - be called sc. See <file:Documentation/isdn/README.sc> and + driver currently builds only in a modularized version. + To build it, choose M here: the module will be called sc. + See <file:Documentation/isdn/README.sc> and <http://www.spellcast.com/> for more information. diff --git a/drivers/md/md.c b/drivers/md/md.c index b49a8708ff64..9e67989ceebe 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1500,6 +1500,7 @@ static int do_md_run(mddev_t * mddev) mdk_rdev_t *rdev; struct gendisk *disk; char b[BDEVNAME_SIZE]; + int unit; if (list_empty(&mddev->disks)) { MD_BUG(); @@ -1591,8 +1592,9 @@ static int do_md_run(mddev_t * mddev) invalidate_bdev(rdev->bdev, 0); } - md_probe(mdidx(mddev), NULL, NULL); - disk = disks[mdidx(mddev)]; + unit = mdidx(mddev); + md_probe(0, &unit, NULL); + disk = disks[unit]; if (!disk) return -ENOMEM; diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index d01c95907bd6..4ead55c0f6fe 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -21,10 +21,8 @@ config VIDEO_DEV Documentation/video4linux/API.html. Documentation for V4L2 is available on the web at http://bytesex.org/v4l/ - This driver is also available as a module called videodev ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called videodev. source "drivers/media/video/Kconfig" diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index 64a4f9788078..569ba707277d 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig @@ -33,11 +33,8 @@ config DVB_BUDGET Say Y if you own such a card and want to use it. - This driver is available as a module called - dvb-ttpci-budget.o ( = code which can be inserted in - and removed from the running kernel whenever you want). - If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called budget. config DVB_BUDGET_CI tristate "Budget cards with onboard CI connector" @@ -49,11 +46,8 @@ config DVB_BUDGET_CI Say Y if you own such a card and want to use it. - This driver is available as a module called - dvb-ttpci-budget-av.o ( = code which can be inserted in - and removed from the running kernel whenever you want). - If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called budget-ci. config DVB_BUDGET_AV tristate "Budget cards with analog video inputs" @@ -65,10 +59,8 @@ config DVB_BUDGET_AV Say Y if you own such a card and want to use it. - This driver is available as a module called - dvb-ttpci-budget-av.o ( = code which can be inserted in - and removed from the running kernel whenever you want). - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called budget-av. config DVB_BUDGET_PATCH tristate "AV7110 cards with Budget Patch" @@ -85,8 +77,5 @@ config DVB_BUDGET_PATCH Say Y if you own such a card and want to use it. - This driver is available as a module called - dvb-ttpci-budget-patch.o ( = code which can be inserted in - and removed from the running kernel whenever you want). - If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called budget-patch. diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 1f23c99d2cdf..0852a8ee3a2e 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -20,10 +20,8 @@ config RADIO_CADET Further documentation on this driver can be found on the WWW at <http://linux.blackhawke.net/cadet.html>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-cadet. + To compile this driver as a module, choose M here: the + module will be called radio-cadet. config RADIO_RTRACK tristate "AIMSlab RadioTrack (aka RadioReveal) support" @@ -48,10 +46,8 @@ config RADIO_RTRACK information is contained in the file <file:Documentation/video4linux/radiotrack.txt>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-aimslab. + To compile this driver as a module, choose M here: the + module will be called radio-aimslab. config RADIO_RTRACK_PORT hex "RadioTrack i/o port (0x20f or 0x30f)" @@ -73,10 +69,8 @@ config RADIO_RTRACK2 this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-rtrack2. + To compile this driver as a module, choose M here: the + module will be called radio-rtrack2. config RADIO_RTRACK2_PORT hex "RadioTrack II i/o port (0x20c or 0x30c)" @@ -98,10 +92,8 @@ config RADIO_AZTECH this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-aztech. + To compile this driver as a module, choose M here: the + module will be called radio-aztech. config RADIO_AZTECH_PORT hex "Aztech/Packard Bell I/O port (0x350 or 0x358)" @@ -124,10 +116,8 @@ config RADIO_GEMTEK this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-gemtek. + To compile this driver as a module, choose M here: the + module will be called radio-gemtek. config RADIO_GEMTEK_PORT hex "GemTek i/o port (0x20c, 0x30c, 0x24c or 0x34c)" @@ -150,10 +140,8 @@ config RADIO_GEMTEK_PCI this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-gemtek-pci. + To compile this driver as a module, choose M here: the + module will be called radio-gemtek-pci. config RADIO_MAXIRADIO tristate "Guillemot MAXI Radio FM 2000 radio" @@ -167,10 +155,8 @@ config RADIO_MAXIRADIO this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-maxiradio. + To compile this driver as a module, choose M here: the + module will be called radio-maxiradio. config RADIO_MAESTRO tristate "Maestro on board radio" @@ -184,10 +170,8 @@ config RADIO_MAESTRO this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-maestro. + To compile this driver as a module, choose M here: the + module will be called radio-maestro. config RADIO_MIROPCM20 tristate "miroSOUND PCM20 radio" @@ -202,10 +186,8 @@ config RADIO_MIROPCM20 this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called miropcm20. + To compile this driver as a module, choose M here: the + module will be called miropcm20. config RADIO_MIROPCM20_RDS tristate "miroSOUND PCM20 radio RDS user interface (EXPERIMENTAL)" @@ -221,7 +203,8 @@ config RADIO_MIROPCM20_RDS availability of RDS is reported over V4L by the basic driver already. Here RDS can be read from files in /dev/v4l/rds. - As module the driver will be called miropcm20-rds. + To compile this driver as a module, choose M here: the + module will be called miropcm20-rds. config RADIO_SF16FMI tristate "SF16FMI Radio" @@ -237,10 +220,8 @@ config RADIO_SF16FMI this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-sf16fmi. + To compile this driver as a module, choose M here: the + module will be called radio-sf16fmi. config RADIO_TERRATEC tristate "TerraTec ActiveRadio ISA Standalone" @@ -260,10 +241,8 @@ config RADIO_TERRATEC this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-terratec. + To compile this driver as a module, choose M here: the + module will be called radio-terratec. config RADIO_TERRATEC_PORT hex "Terratec i/o port (normally 0x590)" @@ -280,10 +259,8 @@ config RADIO_TRUST This is a driver for the Trust FM radio cards. Say Y if you have such a card and want to use it under Linux. - This driver is also available as a module called radio-trust ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called radio-trust. config RADIO_TRUST_PORT hex "Trust i/o port (usually 0x350 or 0x358)" @@ -305,10 +282,8 @@ config RADIO_TYPHOON this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-typhoon. + To compile this driver as a module, choose M here: the + module will be called radio-typhoon. config RADIO_TYPHOON_PROC_FS bool "Support for /proc/radio-typhoon" @@ -351,10 +326,8 @@ config RADIO_ZOLTRIX this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called radio-zoltrix. + To compile this driver as a module, choose M here: the + module will be called radio-zoltrix. config RADIO_ZOLTRIX_PORT hex "ZOLTRIX I/O port (0x20c or 0x30c)" diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 5bab6c162cf7..47cc0f40442f 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -18,20 +18,17 @@ config VIDEO_BT848 If you say Y or M here, you need to say Y or M to "I2C support" and "I2C bit-banging interfaces" in the character device section. - This driver is available as a module called bttv ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called bttv. config VIDEO_PMS tristate "Mediavision Pro Movie Studio Video For Linux" depends on VIDEO_DEV && ISA help - Say Y if you have such a thing. This driver is also available as a - module called pms ( = code which can be inserted in and removed - from the running kernel whenever you want). If you want to compile - it as a module, say M here and read - <file:Documentation/modules.txt>. + Say Y if you have such a thing. + + To compile this driver as a module, choose M here: the + module will be called pms. config VIDEO_PLANB tristate "PlanB Video-In on PowerMac" @@ -51,10 +48,8 @@ config VIDEO_BWQCAM Say Y have if you the black and white version of the QuickCam camera. See the next option for the color version. - This driver is also available as a module called bw-qcam ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called bw-qcam. config VIDEO_CQCAM tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)" @@ -122,10 +117,8 @@ config VIDEO_SAA5249 Support for I2C bus based teletext using the SAA5249 chip. At the moment this is only useful on some European WinTV cards. - This driver is also available as a module called saa5249 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called saa5249. config TUNER_3036 tristate "SAB3036 tuner" @@ -159,10 +152,8 @@ config VIDEO_ZORAN a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For more information, check <file:Documentation/video4linux/Zoran>. - This driver is available as a module called zr36067 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called zr36067. config VIDEO_ZORAN_BUZ tristate "Iomega Buz support" @@ -208,10 +199,8 @@ config VIDEO_ZR36120 and Buster boards. Please read the material in <file:Documentation/video4linux/zr36120.txt> for more information. - This driver is also available as a module called zr36120 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called zr36120. config VIDEO_MEYE tristate "Sony Vaio Picturebook Motion Eye Video For Linux (EXPERIMENTAL)" @@ -224,10 +213,8 @@ config VIDEO_MEYE If you say Y or M here, you need to say Y or M to "Sony Programmable I/O Control Device" in the character device section. - This driver is available as a module called meye ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called meye. config VIDEO_SAA7134 tristate "Philips SAA7134 support" @@ -236,10 +223,8 @@ config VIDEO_SAA7134 This is a video4linux driver for Philips SAA7130/7134 based TV cards. - This driver is available as a module called saa7134 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called saa7134. config VIDEO_MXB tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" @@ -248,10 +233,8 @@ config VIDEO_MXB This is a video4linux driver for the 'Multimedia eXtension Board' TV card by Siemens-Nixdorf. - This driver is available as a module called mxb ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called mxb. config VIDEO_DPC tristate "Philips-Semiconductors 'dpc7146 demonstration board'" @@ -263,10 +246,8 @@ config VIDEO_DPC saa7146 based, analog video card, chances are good that it will work with this skeleton driver. - This driver is available as a module called dpc7146 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called dpc7146. config VIDEO_HEXIUM_ORION tristate "Hexium HV-PCI6 and Orion frame grabber" @@ -275,10 +256,8 @@ config VIDEO_HEXIUM_ORION This is a video4linux driver for the Hexium HV-PCI6 and Orion frame grabber cards by Hexium. - This driver is available as a module called hexium_orion - ( = code which can be inserted in and removed from the - running kernel whenever you want). If you want to compile - it as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called hexium_orion. config VIDEO_HEXIUM_GEMINI tristate "Hexium Gemini frame grabber" @@ -288,10 +267,8 @@ config VIDEO_HEXIUM_GEMINI grabber card by Hexium. Please note that the Gemini Dual card is *not* fully supported. - This driver is available as a module called hexium_gemini - ( = code which can be inserted in and removed from the - running kernel whenever you want). If you want to compile - it as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called hexium_gemini. endmenu diff --git a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig index 7e9ecbc8d59c..4eaacba3a3b5 100644 --- a/drivers/message/fusion/Kconfig +++ b/drivers/message/fusion/Kconfig @@ -29,11 +29,7 @@ config FUSION [2] In order enable capability to boot the linux kernel natively from a Fusion MPT target device, you MUST answer Y here! (currently requires CONFIG_BLK_DEV_SD) - [3] This support is also available as a module ( = code - which can be inserted in and removed from the running - kernel whenever you want). If you want to compile as - modules, say M here and read - <file:Documentation/modules.txt>. + [3] To compile this support as modules, choose M here. If unsure, say N. diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig index fbfbd22cb1bb..01e6932afbf3 100644 --- a/drivers/message/i2o/Kconfig +++ b/drivers/message/i2o/Kconfig @@ -19,11 +19,8 @@ config I2O If you say Y here, you will get a choice of interface adapter drivers and OSM's with the following questions. - This support is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. You will get modules called - i2o_core and i2o_config. + To compile this support as a module, choose M here: the + modules will be called i2o_core and i2o_config. If unsure, say N. @@ -34,10 +31,8 @@ config I2O_PCI Say Y for support of PCI bus I2O interface adapters. Currently this is the only variety supported, so you should say Y. - This support is also available as a module called i2o_pci ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this support as a module, choose M here: the + module will be called i2o_pci. config I2O_BLOCK tristate "I2O Block OSM" @@ -46,10 +41,8 @@ config I2O_BLOCK Include support for the I2O Block OSM. The Block OSM presents disk and other structured block devices to the operating system. - This support is also available as a module called i2o_block ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this support as a module, choose M here: the + module will be called i2o_block. config I2O_SCSI tristate "I2O SCSI OSM" @@ -59,10 +52,8 @@ config I2O_SCSI I2O controller. You can use both the SCSI and Block OSM together if you wish. - This support is also available as a module called i2o_scsi ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this support as a module, choose M here: the + module will be called i2o_scsi. config I2O_PROC tristate "I2O /proc support" @@ -72,10 +63,8 @@ config I2O_PROC able to read I2O related information from the virtual directory /proc/i2o. - This support is also available as a module called i2o_proc ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this support as a module, choose M here: the + module will be called i2o_proc. endmenu diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2e3fabd23b9a..71d2c479189b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -53,9 +53,7 @@ config DUMMY Administrator's Guide, available from <http://www.tldp.org/docs.html#guide>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called dummy. If you want to use more than one dummy device at a time, you need to compile this driver as a module. Instead of 'dummy', the devices will then be called 'dummy0', @@ -78,9 +76,7 @@ config BONDING This is similar to the EQL driver, but it merges Ethernet segments instead of serial lines. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called bonding. config EQUALIZER @@ -100,11 +96,8 @@ config EQUALIZER section 6.2 of the NET-3-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called eql. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module + will be called eql. If unsure, say N. config TUN tristate "Universal TUN/TAP device driver support" @@ -124,10 +117,8 @@ config TUN Please read <file:Documentation/networking/tuntap.txt> for more information. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called tun. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called tun. If you don't know what to use this for, you don't need it. @@ -149,10 +140,8 @@ config ETHERTAP Ethernet device. Please read the file <file:Documentation/networking/ethertap.txt> for more information. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ethertap. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called ethertap. If you don't know what to use this for, you don't need it. @@ -231,10 +220,8 @@ config MACE motherboard will usually use a MACE (Medium Access Control for Ethernet) interface. Say Y to include support for the MACE chip. - This driver is also available as a module called mace ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called mace. config MACE_AAUI_PORT bool "Use AAUI port instead of TP by default" @@ -254,10 +241,8 @@ config BMAC Say Y for support of BMAC Ethernet interfaces. These are used on G3 computers. - This driver is also available as a module called bmac ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called bmac. config OAKNET tristate "National DP83902AV (Oak ethernet) support" @@ -265,10 +250,8 @@ config OAKNET help Say Y if your machine has this type of Ethernet network card. - This driver is also available as a module called oaknet ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called oaknet. config ARIADNE tristate "Ariadne support" @@ -277,10 +260,8 @@ config ARIADNE If you have a Village Tronic Ariadne Ethernet adapter, say Y. Otherwise, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). The module is called ariadne. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called ariadne. config A2065 tristate "A2065 support" @@ -289,10 +270,8 @@ config A2065 If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). The module is called a2065. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called a2065. config HYDRA tristate "Hydra support" @@ -300,10 +279,8 @@ config HYDRA help If you have a Hydra Ethernet adapter, say Y. Otherwise, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). The module is called hydra. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called hydra. config ZORRO8390 tristate "Zorro NS8390-based Ethernet support" @@ -314,10 +291,8 @@ config ZORRO8390 Computers X-Surf Ethernet cards. If you have such a card, say Y. Otherwise, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called zorro8390. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called zorro8390. config APNE tristate "PCMCIA NE2000 support" @@ -326,10 +301,8 @@ config APNE If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise, say N. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). The module is called apne. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called apne. config APOLLO_ELPLUS tristate "Apollo 3c505 support" @@ -358,9 +331,7 @@ config MAC89x0 read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. This module will be called mac89x0. @@ -374,9 +345,7 @@ config MACSONIC one of these say Y and read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. This module will be called macsonic. @@ -395,8 +364,8 @@ config MVME147_NET help Support for the on-board Ethernet interface on the Motorola MVME147 single-board computer. Say Y here to include the - driver for this chip in your kernel. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + driver for this chip in your kernel. + To compile this driver as a module, choose M here. config MVME16x_NET tristate "MVME16x Ethernet support" @@ -404,8 +373,8 @@ config MVME16x_NET help This is the driver for the Ethernet interface on the Motorola MVME162, 166, 167, 172 and 177 boards. Say Y here to include the - driver for this chip in your kernel. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + driver for this chip in your kernel. + To compile this driver as a module, choose M here. config BVME6000_NET tristate "BVME6000 Ethernet support" @@ -413,8 +382,8 @@ config BVME6000_NET help This is the driver for the Ethernet interface on BVME4000 and BVME6000 VME boards. Say Y here to include the driver for this chip - in your kernel. If you want to compile it as a module, say M here - and read <file:Documentation/modules.txt>. + in your kernel. + To compile this driver as a module, choose M here. config ATARILANCE tristate "Atari Lance support" @@ -532,10 +501,8 @@ config SUNLANCE cards are based on the AMD Lance chipset, which is better known via the NE2100 cards. - This support is also available as a module called sunlance ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called sunlance. config HAPPYMEAL tristate "Sun Happy Meal 10/100baseT support" @@ -546,10 +513,8 @@ config HAPPYMEAL both PCI and Sbus devices. This driver also supports the "qfe" quad 100baseT device available in both PCI and Sbus configurations. - This support is also available as a module called sunhme ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called sunhme. config SUNBMAC tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)" @@ -558,10 +523,8 @@ config SUNBMAC This driver supports the "be" interface available as an Sbus option. This is Sun's older 100baseT Ethernet device. - This support is also available as a module called sunbmac ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called sunbmac. config SUNQE tristate "Sun QuadEthernet support" @@ -571,10 +534,8 @@ config SUNQE an Sbus option. Note that this is not the same as Quad FastEthernet "qfe" which is supported by the Happy Meal driver instead. - This support is also available as a module called sunqe ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called sunqe. config SUNGEM tristate "Sun GEM support" @@ -607,11 +568,9 @@ config EL1 have problems. Some people suggest to ping ("man ping") a nearby machine every minute ("man cron") when using this card. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called 3c501. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called 3c501. config EL2 tristate "3c503 \"EtherLink II\" support" @@ -621,11 +580,9 @@ config EL2 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called 3c503. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called 3c503. config ELPLUS tristate "3c505 \"EtherLink Plus\" support" @@ -636,11 +593,9 @@ config ELPLUS this type, say Y and read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called 3c505. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called 3c505. config EL16 tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)" @@ -650,11 +605,9 @@ config EL16 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called 3c507. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called 3c507. config EL3 tristate "3c509/3c529 (MCA)/3c569B (98)/3c579 \"EtherLink III\" support" @@ -668,11 +621,9 @@ config EL3 setup disk to disable Plug & Play mode, and to select the default media type. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called 3c509. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called 3c509. config 3C515 tristate "3c515 ISA \"Fast EtherLink\"" @@ -682,11 +633,9 @@ config 3C515 network card, say Y and read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called 3c515. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called 3c515. config ELMC tristate "3c523 \"EtherLink/MC\" support" @@ -696,11 +645,9 @@ config ELMC the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called 3c523. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called 3c523. config ELMC_II tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)" @@ -710,11 +657,9 @@ config ELMC_II the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called 3c527. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called 3c527. config VORTEX tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support" @@ -735,9 +680,7 @@ config VORTEX <file:Documentation/networking/vortex.txt> and in the comments at the beginning of <file:drivers/net/3c59x.c>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this support as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. config TYPHOON @@ -754,11 +697,9 @@ config TYPHOON the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called typhoon.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called typhoon. config LANCE tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" @@ -769,10 +710,8 @@ config LANCE <http://www.tldp.org/docs.html#howto>. Some LinkSys cards are of this type. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called lance. + To compile this driver as a module, choose M here: the module + will be called lance. This is recommended. config NET_VENDOR_SMC bool "Western Digital/SMC cards" @@ -795,11 +734,9 @@ config WD80x3 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called wd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called wd. config ULTRAMCA tristate "SMC Ultra MCA support" @@ -809,11 +746,9 @@ config ULTRAMCA an MCA based system (PS/2), say Y and read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called smc-mca. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called smc-mca. config ULTRA tristate "SMC Ultra support" @@ -830,11 +765,9 @@ config ULTRA this but keep it in mind if you have such a SCSI card and have problems. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called smc-ultra. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt> as - well as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called smc-ultra. config ULTRA32 tristate "SMC Ultra32 EISA support" @@ -844,11 +777,9 @@ config ULTRA32 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called smc-ultra32. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt> as - well as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called smc-ultra32. config SMC9194 tristate "SMC 9194 support" @@ -861,11 +792,9 @@ config SMC9194 <file:Documentation/networking/smc9.txt> and the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called smc9194. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called smc9194. config NET_VENDOR_RACAL bool "Racal-Interlan (Micom) NI cards" @@ -889,11 +818,9 @@ config NI5010 <http://www.tldp.org/docs.html#howto>. Note that this is still experimental code. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ni5010. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ni5010. config NI52 tristate "NI5210 support" @@ -903,11 +830,9 @@ config NI52 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ni52. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ni52. config NI65 tristate "NI6510 support" @@ -917,11 +842,9 @@ config NI65 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ni65. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ni65. source "drivers/net/tulip/Kconfig" @@ -933,12 +856,9 @@ config AT1700 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called at1700. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called at1700. config DEPCA tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support" @@ -949,12 +869,9 @@ config DEPCA <http://www.tldp.org/docs.html#howto> as well as <file:drivers/net/depca.c>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called - depca. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called depca. config HP100 tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support" @@ -964,11 +881,9 @@ config HP100 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called hp100. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called hp100. config NET_ISA bool "Other ISA cards" @@ -995,11 +910,9 @@ config E2100 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called e2100. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called e2100. config EWRK3 tristate "EtherWORKS 3 (DE203, DE204, DE205) support" @@ -1011,11 +924,9 @@ config EWRK3 well as the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called ewrk3. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ewrk3. config EEXPRESS tristate "EtherExpress 16 support" @@ -1028,11 +939,9 @@ config EEXPRESS because the driver was very unreliable. We now have a new driver that should do better. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called eexpress. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called eexpress. config EEXPRESS_PRO tristate "EtherExpressPro support/EtherExpress 10 (i82595) support" @@ -1044,11 +953,9 @@ config EEXPRESS_PRO driver. Please read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called eepro. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called eepro. config FMV18X tristate "FMV-181/182/183/184 support (OBSOLETE)" @@ -1061,11 +968,9 @@ config FMV18X If you use an FMV-183 or FMV-184 and it is not working, you may need to disable Plug & Play mode of the card. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called fmv18x. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called fmv18x. config HPLAN_PLUS tristate "HP PCLAN+ (27247B and 27252A) support" @@ -1075,11 +980,9 @@ config HPLAN_PLUS the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called hp-plus. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called hp-plus. config HPLAN tristate "HP PCLAN (27245 and other 27xxx series) support" @@ -1089,11 +992,9 @@ config HPLAN the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called hp. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called hp. config LP486E tristate "LP486E on board Ethernet" @@ -1111,11 +1012,9 @@ config ETH16I the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called eth16i. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called eth16i. config NE2000 tristate "NE2000/NE1000 support" @@ -1132,11 +1031,9 @@ config NE2000 laptops), say N here and Y to "NE/2 (ne2000 MCA version) support", below. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ne. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ne. config ZNET tristate "Zenith Z-Note support (EXPERIMENTAL)" @@ -1156,11 +1053,9 @@ config SEEQ8005 is for you, read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. The module will be - called seeq8005. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called seeq8005. config SK_G16 tristate "SK_G16 support (OBSOLETE)" @@ -1230,11 +1125,9 @@ config SKMC of different type hasn't been tested with this driver. Say Y if you have one of these Ethernet adapters. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called sk_mca. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called sk_mca. config NE2_MCA tristate "NE/2 (ne2000 MCA version) support" @@ -1244,11 +1137,9 @@ config NE2_MCA the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ne2. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ne2. config IBMLANA tristate "IBM LAN Adapter/A support" @@ -1256,10 +1147,10 @@ config IBMLANA ---help--- This is a Micro Channel Ethernet adapter. You need to set CONFIG_MCA to use this driver. It is both available as an in-kernel - driver and as a module ( = code which can be inserted in and removed - from the running kernel whenever you want). If you want to compile - it as a module, say M here and read <file:Documentation/modules.txt> - as well as <file:Documentation/networking/net-modules.txt>. The only + driver and as a module. + + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The only currently supported card is the IBM LAN Adapter/A for Ethernet. It will both support 16K and 32K memory windows, however a 32K window gives a better security against packet losses. Usage of multiple @@ -1288,11 +1179,9 @@ config PCNET32 answer Y here and read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called pcnet32. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called pcnet32. config AMD8111_ETH tristate "AMD 8111 (new PCI lance) support" @@ -1302,11 +1191,9 @@ config AMD8111_ETH answer Y here and read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called amd8111e. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called amd8111e. config ADAPTEC_STARFIRE tristate "Adaptec Starfire/DuraLAN support" @@ -1317,10 +1204,8 @@ config ADAPTEC_STARFIRE Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip driver. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called starfire. + To compile this driver as a module, choose M here: the module + will be called starfire. This is recommended. config ADAPTEC_STARFIRE_NAPI bool "Use Rx Polling (NAPI) (EXPERIMENTAL)" @@ -1342,11 +1227,9 @@ config AC3200 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ac3200. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ac3200. config APRICOT tristate "Apricot Xen-II on board Ethernet" @@ -1356,9 +1239,7 @@ config APRICOT read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. The module will be called apricot. @@ -1370,9 +1251,7 @@ config B44 read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. The module will be called b44. @@ -1386,9 +1265,7 @@ config CS89x0 <http://www.tldp.org/docs.html#howto> as well as <file:Documentation/networking/cs89x0.txt>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. The module will be called cs89x. @@ -1407,11 +1284,9 @@ config DGRS <http://www.tldp.org/docs.html#howto>. More specific information is contained in <file:Documentation/networking/dgrs.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called dgrs. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called dgrs. config EEPRO100 tristate "EtherExpressPro/100 support (eepro100, original Becker driver)" @@ -1421,11 +1296,9 @@ config EEPRO100 card, say Y and read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called eepro100. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt> as - well as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called eepro100. config EEPRO100_PIO @@ -1509,11 +1382,9 @@ config E100 More specific information on configuring the driver is in <file:Documentation/networking/e100.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called e100. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called e100. config LNE390 tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)" @@ -1523,11 +1394,9 @@ config LNE390 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called lne390. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called lne390. config FEALNX tristate "Myson MTD-8xx PCI Ethernet support" @@ -1562,11 +1431,9 @@ config NE2K_PCI NetVin NV5000SC Via 86C926 SureCom NE34 Winbond Holtek HT80232 Holtek HT80229 - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ne2k-pci. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt> as - well as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ne2k-pci. config NE3210 tristate "Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)" @@ -1577,11 +1444,9 @@ config NE3210 <http://www.tldp.org/docs.html#howto>. Note that this driver will NOT WORK for NE3200 cards as they are completely different. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ne3210. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ne3210. config ES3210 tristate "Racal-Interlan EISA ES3210 support (EXPERIMENTAL)" @@ -1591,11 +1456,9 @@ config ES3210 the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called es3210. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called es3210. config 8139CP tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)" @@ -1606,10 +1469,8 @@ config 8139CP the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read Documentation/modules.txt. This is recommended. - The module will be called 8139cp. + To compile this driver as a module, choose M here: the module + will be called 8139cp. This is recommended. config 8139TOO tristate "RealTek RTL-8139 PCI Fast Ethernet Adapter support" @@ -1621,10 +1482,8 @@ config 8139TOO Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called 8139too. + To compile this driver as a module, choose M here: the module + will be called 8139too. This is recommended. config 8139TOO_PIO bool "Use PIO instead of MMIO" @@ -1680,10 +1539,8 @@ config SIS900 This driver also supports AMD 79C901 HomePNA so that you can use your phone line as a network cable. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called sis900. + To compile this driver as a module, choose M here: the module + will be called sis900. This is recommended. config EPIC100 tristate "SMC EtherPower II" @@ -1725,11 +1582,9 @@ config TLAN Compaq NetFlex and Olicom cards. Please read the file <file:Documentation/networking/tlan.txt> for more details. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called tlan. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called tlan. Please email feedback to torben.mathiasen@compaq.com. @@ -1740,11 +1595,9 @@ config VIA_RHINE If you have a VIA "rhine" based network card (Rhine-I (3043) or Rhine-2 (VT86c100A)), say Y here. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called via-rhine. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt> as - well as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called via-rhine. config VIA_RHINE_MMIO bool "Use MMIO instead of PIO (EXPERIMENTAL)" @@ -1802,10 +1655,8 @@ config ATP said N to the "Parallel printer support", because the two drivers don't like each other. - If you want to compile this driver as a module however ( = code - which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called atp. + To compile this driver as a module, choose M here: the module + will be called atp. config DE600 tristate "D-Link DE600 pocket adapter support" @@ -1819,11 +1670,8 @@ config DE600 port and it is safe to compile the corresponding drivers into the kernel. - If you want to compile this driver as a module however ( = code - which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. - The module will be called de600. + To compile this driver as a module, choose M here: the module + will be called de600. config DE620 tristate "D-Link DE620 pocket adapter support" @@ -1837,11 +1685,8 @@ config DE620 port and it is safe to compile the corresponding drivers into the kernel. - If you want to compile this driver as a module however ( = code - which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. - The module will be called de620. + To compile this driver as a module, choose M here: the module + will be called de620. config SGISEEQ tristate "SGI Seeq ethernet controller support" @@ -1900,10 +1745,8 @@ config ACENIC as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig line. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called acenic. + To compile this driver as a module, choose M here: the + module will be called acenic. config ACENIC_OMIT_TIGON_I bool "Omit support for old Tigon I based AceNICs" @@ -1927,10 +1770,8 @@ config DL2K D-Link DGE-550T Gigabit Ethernet Adapter. D-Link DL2000-based Gigabit Ethernet Adapter. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called dl2k. + To compile this driver as a module, choose M here: the + module will be called dl2k. config E1000 tristate "Intel(R) PRO/1000 Gigabit Ethernet support" @@ -1971,11 +1812,9 @@ config E1000 More specific information on configuring the driver is in <file:Documentation/networking/e1000.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called e1000. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called e1000. config E1000_NAPI bool "Use Rx Polling (NAPI)" @@ -1987,10 +1826,8 @@ config MYRI_SBUS help This driver supports MyriCOM Sbus gigabit Ethernet cards. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called myri_sbus. + To compile this driver as a module, choose M here: the module + will be called myri_sbus. This is recommended. config NS83820 tristate "National Semiconduct DP83820 support" @@ -2010,9 +1847,7 @@ config HAMACHI the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. The module will be called hamachi. @@ -2026,10 +1861,8 @@ config YELLOWFIN <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more information about this driver in particular and Beowulf in general. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called yellowfin. + To compile this driver as a module, choose M here: the module + will be called yellowfin. This is recommended. config R8169 tristate "Realtek 8169 gigabit ethernet support" @@ -2037,10 +1870,8 @@ config R8169 ---help--- Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called r8169. + To compile this driver as a module, choose M here: the module + will be called r8169. This is recommended. config SIS190 tristate "SiS190 gigabit ethernet support (EXPERIMENTAL)" @@ -2048,10 +1879,8 @@ config SIS190 ---help--- Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called sis190. + To compile this driver as a module, choose M here: the module + will be called sis190. This is recommended. config SK98LIN tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support" @@ -2112,12 +1941,10 @@ config SK98LIN optional driver parameters. Questions concerning this driver may be addressed to: linux@syskonnect.de - - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read Documentation/modules.txt. This is recommended. - The module will be called sk98lin.o. - + + To compile this driver as a module, choose M here: the module + will be called sk98lin. This is recommended. + config CONFIG_SK98LIN_T1 bool "3Com 3C940/3C941 Gigabit Ethernet Adapter" depends on SK98LIN @@ -2259,10 +2086,8 @@ config TIGON3 help This driver supports Broadcom Tigon3 based gigabit Ethernet cards. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called tg3. + To compile this driver as a module, choose M here: the module + will be called tg3. This is recommended. endmenu @@ -2297,11 +2122,9 @@ config IXGB More specific information on configuring the driver is in <file:Documentation/networking/ixgb.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ixgb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module + will be called ixgb. config IXGB_NAPI bool "Use Rx Polling (NAPI) (EXPERIMENTAL)" @@ -2360,10 +2183,8 @@ config SKFP Questions concerning this driver can be addressed to: linux@syskonnect.de - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called skfp. + To compile this driver as a module, choose M here: the module + will be called skfp. This is recommended. config HIPPI bool "HIPPI driver support (EXPERIMENTAL)" @@ -2384,11 +2205,8 @@ config ROADRUNNER help Say Y here if this is your PCI HIPPI network card. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called rrunner. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module + will be called rrunner. If unsure, say N. config ROADRUNNER_LARGE_RINGS bool "Use large TX/RX rings (EXPERIMENTAL)" @@ -2431,9 +2249,7 @@ config PLIP with the PLIP support in Linux versions 1.0.x. This option enlarges your kernel by about 8 KB. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. The module will be called plip. If unsure, say Y or M, in case you buy a laptop later. @@ -2463,14 +2279,11 @@ config PPP synchronous lines, you should say Y (or M) here and to "Support synchronous PPP", below. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). If you said Y to "Version information on all symbols" above, then you cannot compile the PPP driver into the kernel; you can then only - compile it as a module. The module will be called ppp_generic. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt> as well as - <file:Documentation/networking/net-modules.txt>. + compile it as a module. To compile this driver as a module, choose M + here and read <file:Documentation/networking/net-modules.txt>. + The module will be called ppp_generic. config PPP_MULTILINK bool "PPP multilink support (EXPERIMENTAL)" @@ -2507,9 +2320,7 @@ config PPP_ASYNC a modem (not a synchronous or ISDN modem) to contact your ISP, you need this option. - This code is also available as a module (code which can be inserted - into and removed from the running kernel). If you want to compile - it as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. If unsure, say Y. @@ -2521,10 +2332,7 @@ config PPP_SYNC_TTY (HDLC) tty devices, such as the SyncLink adapter. These devices are often used for high-speed leased lines like T1/E1. - This code is also available as a module (code which can be inserted - into and removed from the running kernel). If you want to compile - it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config PPP_DEFLATE tristate "PPP Deflate compression" @@ -2537,10 +2345,7 @@ config PPP_DEFLATE Deflate compression method as well for this to be useful. Even if they don't support it, it is safe to say Y here. - This code is also available as a module (code which can be inserted - into and removed from the running kernel). If you want to compile - it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here. config PPP_BSDCOMP tristate "PPP BSD-Compress compression" @@ -2610,9 +2415,7 @@ config SLIP <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP support will enlarge your kernel by about 4 KB. If unsure, say N. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> as well as + To compile this driver as a module, choose M here and read <file:Documentation/networking/net-modules.txt>. The module will be called slip. @@ -2674,10 +2477,8 @@ config IPHASE5526 help Say Y here if you have a Fibre Channel adaptor of this kind. - The driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called iph5526. For general information about - modules read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called iph5526. config RCPCI tristate "Red Creek Hardware VPN (EXPERIMENTAL)" @@ -2686,10 +2487,8 @@ config RCPCI This is a driver for hardware which provides a Virtual Private Network (VPN). Say Y if you have it. - This code is also available as a module called rcpci ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called rcpci. config SHAPER tristate "Traffic Shaper (EXPERIMENTAL)" @@ -2709,11 +2508,8 @@ config SHAPER program, available from <ftp://shadow.cabi.net/pub/Linux/> in the shaper package. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called shaper. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module + will be called shaper. If unsure, say N. source "drivers/net/wan/Kconfig" diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig index b99acd69cc6c..60b19679ca5c 100644 --- a/drivers/net/appletalk/Kconfig +++ b/drivers/net/appletalk/Kconfig @@ -65,10 +65,8 @@ config IPDDP decapsulation, but not both. With the following two questions, you decide which one you want. - If you say M here, the AppleTalk-IP support will be compiled as a - module ( = code which can be inserted in and removed from the - running kernel whenever you want, read - <file:Documentation/modules.txt>). The module is called ipddp. + To compile the AppleTalk-IP support as a module, choose M here: the + module will be called ipddp. In this case, you will be able to use both encapsulation and decapsulation simultaneously, by loading two copies of the module and specifying different values for the module option ipddp_mode. diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index b44c6c19abd3..98e296e04671 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig @@ -12,9 +12,7 @@ config MKISS the advantage that it is already supported by most modern TNCs without the need for a firmware upgrade. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called mkiss. config 6PACK @@ -32,9 +30,7 @@ config 6PACK problems. For details about the features and the usage of the driver, read <file:Documentation/networking/6pack.txt>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called 6pack. config BPQETHER @@ -91,9 +87,7 @@ config SCC <http://www.tldp.org/docs.html#howto>. Also make sure to say Y to "Amateur Radio AX.25 Level 2" support. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called scc. config SCC_DELAY @@ -129,10 +123,8 @@ config BAYCOM_SER_FDX information on the modems, see <http://www.baycom.de/> and <file:Documentation/networking/baycom.txt>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called baycom_ser_fdx. + To compile this driver as a module, choose M here: the module + will be called baycom_ser_fdx. This is recommended. config BAYCOM_SER_HDX tristate "BAYCOM ser12 halfduplex driver for AX.25" @@ -148,10 +140,8 @@ config BAYCOM_SER_HDX <http://www.baycom.de/> and <file:Documentation/networking/baycom.txt>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called baycom_ser_hdx. + To compile this driver as a module, choose M here: the module + will be called baycom_ser_hdx. This is recommended. config BAYCOM_PAR tristate "BAYCOM picpar and par96 driver for AX.25" @@ -164,10 +154,8 @@ config BAYCOM_PAR the modems, see <http://www.baycom.de/> and the file <file:Documentation/networking/baycom.txt>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called baycom_par. + To compile this driver as a module, choose M here: the module + will be called baycom_par. This is recommended. config BAYCOM_EPP tristate "BAYCOM epp driver for AX.25" @@ -180,10 +168,8 @@ config BAYCOM_EPP modems, see <http://www.baycom.de/> and the file <file:Documentation/networking/baycom.txt>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. This is - recommended. The module will be called baycom_par. + To compile this driver as a module, choose M here: the module + will be called baycom_epp. This is recommended. config YAM tristate "YAM driver for AX.25" @@ -193,7 +179,6 @@ config YAM port and includes some of the functions of a Terminal Node Controller. If you have one of those, say Y here. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called yam. diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 12547d2d2d7f..3843347e5e8d 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig @@ -9,12 +9,12 @@ config IRTTY_SIR depends on IRDA help Say Y here if you want to build support for the IrTTY line - discipline. If you want to compile it as a module (irtty-sir), say M - here and read <file:Documentation/modules.txt>. IrTTY makes it - possible to use Linux's own serial driver for all IrDA ports that - are 16550 compatible. Most IrDA chips are 16550 compatible so you - should probably say Y to this option. Using IrTTY will however - limit the speed of the connection to 115200 bps (IrDA SIR mode). + discipline. To compile it as a module, choose M here: the module + will be called irtty-sir. IrTTY makes it possible to use Linux's + own serial driver for all IrDA ports that are 16550 compatible. + Most IrDA chips are 16550 compatible so you should probably say Y + to this option. Using IrTTY will however limit the speed of the + connection to 115200 bps (IrDA SIR mode). If unsure, say Y. @@ -37,22 +37,21 @@ config ESI_DONGLE depends on DONGLE && IRDA help Say Y here if you want to build support for the Extended Systems - JetEye PC dongle. If you want to compile it as a module, say M here - and read <file:Documentation/modules.txt>. The ESI dongle attaches - to the normal 9-pin serial port connector, and can currently only be - used by IrTTY. To activate support for ESI dongles you will have to - start irattach like this: "irattach -d esi". + JetEye PC dongle. To compile it as a module, choose M here. The ESI + dongle attaches to the normal 9-pin serial port connector, and can + currently only be used by IrTTY. To activate support for ESI + dongles you will have to start irattach like this: + "irattach -d esi". config ACTISYS_DONGLE tristate "ACTiSYS IR-220L and IR220L+ dongle" depends on DONGLE && IRDA help Say Y here if you want to build support for the ACTiSYS IR-220L and - IR220L+ dongles. If you want to compile it as a module, say M here - and read <file:Documentation/modules.txt>. The ACTiSYS dongles - attaches to the normal 9-pin serial port connector, and can - currently only be used by IrTTY. To activate support for ACTiSYS - dongles you will have to start irattach like this: + IR220L+ dongles. To compile it as a module, choose M here. The + ACTiSYS dongles attaches to the normal 9-pin serial port connector, + and can currently only be used by IrTTY. To activate support for + ACTiSYS dongles you will have to start irattach like this: "irattach -d actisys" or "irattach -d actisys+". config TEKRAM_DONGLE @@ -60,11 +59,11 @@ config TEKRAM_DONGLE depends on DONGLE && IRDA help Say Y here if you want to build support for the Tekram IrMate 210B - dongle. If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The Tekram dongle attaches to the - normal 9-pin serial port connector, and can currently only be used - by IrTTY. To activate support for Tekram dongles you will have to - start irattach like this: "irattach -d tekram". + dongle. To compile it as a module, choose M here. The Tekram dongle + attaches to the normal 9-pin serial port connector, and can + currently only be used by IrTTY. To activate support for Tekram + dongles you will have to start irattach like this: + "irattach -d tekram". comment "Old SIR device drivers" @@ -73,15 +72,14 @@ config IRPORT_SIR depends on IRDA ---help--- Say Y here if you want to build support for the IrPORT IrDA device - driver. If you want to compile it as a module (irport), say M here - and read <file:Documentation/modules.txt>. IrPORT can be used - instead of IrTTY and sometimes this can be better. One example is - if your IrDA port does not have echo-canceling, which will work OK - with IrPORT since this driver is working in half-duplex mode only. - You don't need to use irattach with IrPORT, but you just insert it - the same way as FIR drivers (insmod irport io=0x3e8 irq=11). Notice - that IrPORT is a SIR device driver which means that speed is limited - to 115200 bps. + driver. To compile it as a module, choose M here: the module will be + called irport. IrPORT can be used instead of IrTTY and sometimes + this can be better. One example is if your IrDA port does not + have echo-canceling, which will work OK with IrPORT since this + driver is working in half-duplex mode only. You don't need to use + irattach with IrPORT, but you just insert it the same way as FIR + drivers (insmod irport io=0x3e8 irq=11). Notice that IrPORT is a + SIR device driver which means that speed is limited to 115200 bps. If unsure, say Y. @@ -104,22 +102,21 @@ config ESI_DONGLE_OLD depends on DONGLE_OLD && IRDA help Say Y here if you want to build support for the Extended Systems - JetEye PC dongle. If you want to compile it as a module, say M here - and read <file:Documentation/modules.txt>. The ESI dongle attaches - to the normal 9-pin serial port connector, and can currently only be - used by IrTTY. To activate support for ESI dongles you will have to - start irattach like this: "irattach -d esi". + JetEye PC dongle. To compile it as a module, choose M here. The ESI + dongle attaches to the normal 9-pin serial port connector, and can + currently only be used by IrTTY. To activate support for ESI + dongles you will have to start irattach like this: + "irattach -d esi". config ACTISYS_DONGLE_OLD tristate "ACTiSYS IR-220L and IR220L+ dongle" depends on DONGLE_OLD && IRDA help Say Y here if you want to build support for the ACTiSYS IR-220L and - IR220L+ dongles. If you want to compile it as a module, say M here - and read <file:Documentation/modules.txt>. The ACTiSYS dongles - attaches to the normal 9-pin serial port connector, and can - currently only be used by IrTTY. To activate support for ACTiSYS - dongles you will have to start irattach like this: + IR220L+ dongles. To compile it as a module, choose M here. The + ACTiSYS dongles attaches to the normal 9-pin serial port connector, + and can currently only be used by IrTTY. To activate support for + ACTiSYS dongles you will have to start irattach like this: "irattach -d actisys" or "irattach -d actisys+". config TEKRAM_DONGLE_OLD @@ -127,44 +124,44 @@ config TEKRAM_DONGLE_OLD depends on DONGLE_OLD && IRDA help Say Y here if you want to build support for the Tekram IrMate 210B - dongle. If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The Tekram dongle attaches to the - normal 9-pin serial port connector, and can currently only be used - by IrTTY. To activate support for Tekram dongles you will have to - start irattach like this: "irattach -d tekram". + dongle. To compile it as a module, choose M here. The Tekram dongle + attaches to the normal 9-pin serial port connector, and can + currently only be used by IrTTY. To activate support for Tekram + dongles you will have to start irattach like this: + "irattach -d tekram". config GIRBIL_DONGLE tristate "Greenwich GIrBIL dongle" depends on DONGLE_OLD && IRDA help Say Y here if you want to build support for the Greenwich GIrBIL - dongle. If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The Greenwich dongle attaches to - the normal 9-pin serial port connector, and can currently only be - used by IrTTY. To activate support for Greenwich dongles you will - have to insert "irattach -d girbil" in the /etc/irda/drivers script. + dongle. To compile it as a module, choose M here. The Greenwich + dongle attaches to the normal 9-pin serial port connector, and can + currently only be used by IrTTY. To activate support for Greenwich + dongles you will have to insert "irattach -d girbil" in the + /etc/irda/drivers script. config LITELINK_DONGLE tristate "Parallax LiteLink dongle" depends on DONGLE_OLD && IRDA help Say Y here if you want to build support for the Parallax Litelink - dongle. If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The Parallax dongle attaches to - the normal 9-pin serial port connector, and can currently only be - used by IrTTY. To activate support for Parallax dongles you will - have to start irattach like this "irattach -d litelink". + dongle. To compile it as a module, choose M here. The Parallax + dongle attaches to the normal 9-pin serial port connector, and can + currently only be used by IrTTY. To activate support for Parallax + dongles you will have to start irattach like this: + "irattach -d litelink". config MCP2120_DONGLE tristate "Microchip MCP2120" depends on DONGLE_OLD && IRDA help Say Y here if you want to build support for the Microchip MCP2120 - dongle. If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The MCP2120 dongle attaches to - the normal 9-pin serial port connector, and can currently only be - used by IrTTY. To activate support for MCP2120 dongles you will - have to insert "irattach -d mcp2120" in the /etc/irda/drivers script. + dongle. To compile it as a module, choose M here. The MCP2120 dongle + attaches to the normal 9-pin serial port connector, and can + currently only be used by IrTTY. To activate support for MCP2120 + dongles you will have to insert "irattach -d mcp2120" in the + /etc/irda/drivers script. You must build this dongle yourself. For more information see: <http://www.eyetap.org/~tangf/irda_sir_linux.html> @@ -174,10 +171,9 @@ config OLD_BELKIN_DONGLE depends on DONGLE_OLD && IRDA help Say Y here if you want to build support for the Adaptec Airport 1000 - and 2000 dongles. If you want to compile it as a module, say M here - and read <file:Documentation/modules.txt>. The module will be - called old_belkin. Some information is contained in the comments - at the top of <file:drivers/net/irda/old_belkin.c>. + and 2000 dongles. To compile it as a module, choose M here: the module + will be called old_belkin. Some information is contained in the + comments at the top of <file:drivers/net/irda/old_belkin.c>. config EP7211_IR tristate "EP7211 I/R support" @@ -188,25 +184,24 @@ config ACT200L_DONGLE depends on DONGLE_OLD && EXPERIMENTAL && IRDA help Say Y here if you want to build support for the ACTiSYS IR-200L - dongle. If you want to compile it as a module, say M here and read - Documentation/modules.txt. The ACTiSYS IR-200L dongle attaches to - the normal 9-pin serial port connector, and can currently only be - used by IrTTY. To activate support for ACTiSYS IR-200L dongles - you will have to start irattach like this: "irattach -d act200l". + dongle. To compile it as a module, choose M here. The ACTiSYS + IR-200L dongle attaches to the normal 9-pin serial port connector, + and can currently only be used by IrTTY. To activate support for + ACTiSYS IR-200L dongles you will have to start irattach like this: + "irattach -d act200l". config MA600_DONGLE tristate "Mobile Action MA600 dongle (EXPERIMENTAL)" depends on DONGLE_OLD && EXPERIMENTAL && IRDA ---help--- Say Y here if you want to build support for the Mobile Action MA600 - dongle. If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The MA600 dongle attaches to - the normal 9-pin serial port connector, and can currently only be - tested on IrCOMM. To activate support for MA600 dongles you will - have to insert "irattach -d ma600" in the /etc/irda/drivers script. - Note: irutils 0.9.15 requires no modification. irutils 0.9.9 needs - modification. For more information, download the following tar gzip - file. + dongle. To compile it as a module, choose M here. The MA600 dongle + attaches to the normal 9-pin serial port connector, and can + currently only be tested on IrCOMM. To activate support for MA600 + dongles you will have to insert "irattach -d ma600" in the + /etc/irda/drivers script. Note: irutils 0.9.15 requires no + modification. irutils 0.9.9 needs modification. For more + information, download the following tar gzip file. There is a pre-compiled module on <http://engsvr.ust.hk/~eetwl95/download/ma600-2.4.x.tar.gz> @@ -218,13 +213,12 @@ config USB_IRDA depends on IRDA && USB ---help--- Say Y here if you want to build support for the USB IrDA FIR Dongle - device driver. If you want to compile it as a module (irda-usb), - say M here and read <file:Documentation/modules.txt>. IrDA-USB - support the various IrDA USB dongles available and most of their - pecularities. Those dongles plug in the USB port of your computer, - are plug and play, and support SIR and FIR (4Mbps) speeds. On the - other hand, those dongles tend to be less efficient than a FIR - chipset. + device driver. To compile it as a module, choose M here: the module + will be called irda-usb. IrDA-USB support the various IrDA USB + dongles available and most of their pecularities. Those dongles + plug in the USB port of your computer, are plug and play, and + support SIR and FIR (4Mbps) speeds. On the other hand, those + dongles tend to be less efficient than a FIR chipset. Please note that the driver is still experimental. And of course, you will need both USB and IrDA support in your kernel... @@ -237,8 +231,7 @@ config NSC_FIR PC87338 IrDA chipsets. This driver supports SIR, MIR and FIR (4Mbps) speeds. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called + To compile it as a module, choose M here: the module will be called nsc-ircc. config WINBOND_FIR @@ -250,8 +243,7 @@ config WINBOND_FIR chipset in the Corel NetWinder. The driver supports SIR, MIR and FIR (4Mbps) speeds. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called + To compile it as a module, choose M here: the module will be called w83977af_ir. config TOSHIBA_FIR @@ -261,9 +253,8 @@ config TOSHIBA_FIR Say Y here if you want to build support for the Toshiba Type-O IR and Donau oboe chipsets. These chipsets are used by the Toshiba Libretto 100/110CT, Tecra 8100, Portege 7020 and many more laptops. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. - The module will be called donauboe. + To compile it as a module, choose M here: the module will be called + donauboe. config AU1000_FIR tristate "Alchemy Au1000 SIR/FIR" @@ -276,9 +267,8 @@ config SMC_IRCC_FIR Say Y here if you want to build support for the SMC Infrared Communications Controller. It is used in a wide variety of laptops (Fujitsu, Sony, Compaq and some Toshiba). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be - called smsc-ircc2.o. + To compile it as a module, choose M here: the module will be called + smsc-ircc2.o. config ALI_FIR tristate "ALi M5123 FIR (EXPERIMENTAL)" @@ -289,8 +279,7 @@ config ALI_FIR M1535, M1535D, M1535+, M1535D Sourth Bridge. This driver supports SIR, MIR and FIR (4Mbps) speeds. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called + To compile it as a module, choose M here: the module will be called ali-ircc. config VLSI_FIR @@ -302,8 +291,7 @@ config VLSI_FIR and 5500 notebooks. The driver provides support for SIR, MIR and FIR (4Mbps) speeds. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called + To compile it as a module, choose M here: the module will be called vlsi_ir. config SA1100_FIR @@ -324,8 +312,7 @@ config VIA_FIR You will need to specify the 'dongle_id' module parameter to indicate the FIR dongle attached to the controller. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called + To compile it as a module, choose M here: the module will be called via-ircc. endmenu diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig index c317cccbd6b6..05f7054ff4ce 100644 --- a/drivers/net/pcmcia/Kconfig +++ b/drivers/net/pcmcia/Kconfig @@ -28,11 +28,8 @@ config PCMCIA_3C589 Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA (PC-card) Ethernet card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called 3c589_cs. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module will be + called 3c589_cs. If unsure, say N. config PCMCIA_3C574 tristate "3Com 3c574 PCMCIA support" @@ -41,11 +38,8 @@ config PCMCIA_3C574 Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA (PC-card) Fast Ethernet card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called 3c574_cs. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module will be + called 3c574_cs. If unsure, say N. config PCMCIA_FMVJ18X tristate "Fujitsu FMV-J18x PCMCIA support" @@ -54,11 +48,8 @@ config PCMCIA_FMVJ18X Say Y here if you intend to attach a Fujitsu FMV-J18x or compatible PCMCIA (PC-card) Ethernet card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called fmvj18x_cs. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. - If unsure, say N. + To compile this driver as a module, choose M here: the module will be + called fmvj18x_cs. If unsure, say N. config PCMCIA_PCNET tristate "NE2000 compatible PCMCIA support" @@ -67,11 +58,8 @@ config PCMCIA_PCNET Say Y here if you intend to attach an NE2000 compatible PCMCIA (PC-card) Ethernet or Fast Ethernet card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called pcnet_cs. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module will be + called pcnet_cs. If unsure, say N. config PCMCIA_NMCLAN tristate "New Media PCMCIA support" @@ -80,11 +68,8 @@ config PCMCIA_NMCLAN Say Y here if you intend to attach a New Media Ethernet or LiveWire PCMCIA (PC-card) Ethernet card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called nmclan_cs. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module will be + called nmclan_cs. If unsure, say N. config PCMCIA_SMC91C92 tristate "SMC 91Cxx PCMCIA support" @@ -93,11 +78,8 @@ config PCMCIA_SMC91C92 Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA (PC-card) Ethernet or Fast Ethernet card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called smc91c92_cs. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. - If unsure, say N. + To compile this driver as a module, choose M here: the module will be + called smc91c92_cs. If unsure, say N. config PCMCIA_XIRC2PS tristate "Xircom 16-bit PCMCIA support" @@ -106,11 +88,8 @@ config PCMCIA_XIRC2PS Say Y here if you intend to attach a Xircom 16-bit PCMCIA (PC-card) Ethernet or Fast Ethernet card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called xirc2ps_cs. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. - If unsure, say N. + To compile this driver as a module, choose M here: the module will be + called xirc2ps_cs. If unsure, say N. config PCMCIA_AXNET tristate "Asix AX88190 PCMCIA support" @@ -121,11 +100,8 @@ config PCMCIA_AXNET nearly NE2000 compatible but need a separate driver due to a few misfeatures. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called axnet_cs. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module will be + called axnet_cs. If unsure, say N. config ARCNET_COM20020_CS tristate "COM20020 ARCnet PCMCIA support" @@ -134,11 +110,8 @@ config ARCNET_COM20020_CS Say Y here if you intend to attach this type of ARCnet PCMCIA card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called com20020_cs. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. - If unsure, say N. + To compile this driver as a module, choose M here: the module will be + called com20020_cs. If unsure, say N. config PCMCIA_IBMTR tristate "IBM PCMCIA tokenring adapter support" @@ -148,10 +121,8 @@ config PCMCIA_IBMTR card to your computer. You then also need to say Y to "Token Ring driver support". - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ibmtr_cs. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called ibmtr_cs. endmenu diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig index b93d2a88d32b..c69f68dbeaf7 100644 --- a/drivers/net/tokenring/Kconfig +++ b/drivers/net/tokenring/Kconfig @@ -31,10 +31,8 @@ config IBMTR Warning: this driver will almost definitely fail if more than one active Token Ring card is present. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ibmtr. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called ibmtr. config IBMOL tristate "IBM Olympic chipset PCI adapter support" @@ -47,10 +45,8 @@ config IBMOL If you have such an adapter, say Y and read the Token-Ring mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called olympic. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called olympic. Also read <file:Documentation/networking/olympic.txt> or check the Linux Token Ring Project site for the latest information at @@ -65,10 +61,8 @@ config IBMLS If you have such an adapter, say Y and read the Token-Ring mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a modules ( = code which can be - inserted in and removed from the running kernel whenever you want). - The modules will be called lanstreamer. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called lanstreamer. config 3C359 tristate "3Com 3C359 Token Link Velocity XL adapter support" @@ -81,10 +75,8 @@ config 3C359 If you have such an adapter, say Y and read the Token-Ring mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will will be called 3c359. If you want to compile it - as a module, say M here and read Documentation/modules.txt. + To compile this driver as a module, choose M here: the module will be + called 3c359. Also read the file <file:Documentation/networking/3c359.txt> or check the Linux Token Ring Project site for the latest information at @@ -110,10 +102,8 @@ config TMS380TR Also read the file <file:Documentation/networking/tms380tr.txt> or check <http://www.auk.cx/tms380tr/>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called tms380tr. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called tms380tr. config TMSPCI tristate "Generic TMS380 PCI support" @@ -127,10 +117,8 @@ config TMSPCI - Thomas-Conrad TC4048 PCI 4/16 - 3Com Token Link Velocity - This driver is available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called tmspci. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called tmspci. config SKISA tristate "SysKonnect TR4/16 ISA support" @@ -141,10 +129,8 @@ config SKISA These cards are known to work: - SysKonnect TR4/16 ISA (SK-4190) - This driver is available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called skisa. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called skisa. config PROTEON tristate "Proteon ISA support" @@ -156,10 +142,8 @@ config PROTEON - Proteon 1392 - Proteon 1392 plus - This driver is available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called proteon. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called proteon. config ABYSS tristate "Madge Smart 16/4 PCI Mk2 support" @@ -168,10 +152,8 @@ config ABYSS This tms380 module supports the Madge Smart 16/4 PCI Mk2 cards (51-02). - This driver is available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called abyss. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called abyss. config MADGEMC tristate "Madge Smart 16/4 Ringnode MicroChannel" @@ -180,10 +162,8 @@ config MADGEMC This tms380 module supports the Madge Smart 16/4 MC16 and MC32 MicroChannel adapters. - This driver is available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called madgemc. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called madgemc. config SMCTR tristate "SMC ISA/MCA adapter support" @@ -198,10 +178,8 @@ config SMCTR <http://www.tldp.org/docs.html#howto> and the file <file:Documentation/networking/smctr.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called smctr. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called smctr. endmenu diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig index 54003a7c6cea..1d07059661c4 100644 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig @@ -52,10 +52,7 @@ config COSA <file:drivers/net/wan/cosa.c> for details about the cards and the driver itself. - The driver will be compiled as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cosa. For general information about - modules read <file:Documentation/modules.txt>. + The driver will be compiled as a module: the module will be called cosa. # # COMX drivers @@ -76,8 +73,8 @@ config COMX You must say Y to "/proc file system support" (CONFIG_PROC_FS) to use this driver. - If you want to compile this as a module, say M and read - <file:Documentation/modules.txt>. The module will be called comx. + To compile this driver as a module, choose M here: the + module will be called comx. config COMX_HW_COMX tristate "Support for COMX/CMX/HiCOMX boards" @@ -89,9 +86,8 @@ config COMX_HW_COMX You will need additional firmware to use these cards, which are downloadable from <ftp://ftp.itc.hu/>. - If you want to compile this as a module, say M and read - <file:Documentation/modules.txt>. The module will be called - comx-hw-comx. + To compile this driver as a module, choose M here: the + module will be called comx-hw-comx. config COMX_HW_LOCOMX tristate "Support for LoCOMX board" @@ -100,9 +96,8 @@ config COMX_HW_LOCOMX Hardware driver for the 'LoCOMX' board from the MultiGate family. Say Y if you have a board like this. - If you want to compile this as a module, say M and read - <file:Documentation/modules.txt>. The module will be called - comx-hw-locomx. + To compile this driver as a module, choose M here: the + module will be called comx-hw-locomx. config COMX_HW_MIXCOM tristate "Support for MixCOM board" @@ -118,9 +113,8 @@ config COMX_HW_MIXCOM driver for the flash ROM of this card is available separately on <ftp://ftp.itc.hu/>. - If you want to compile this as a module, say M and read - <file:Documentation/modules.txt>. The module will be called - comx-hw-mixcom. + To compile this driver as a module, choose M here: the + module will be called comx-hw-mixcom. config COMX_HW_MUNICH tristate "Support for MUNICH based boards: SliceCOM, PCICOM (WelCOM)" @@ -129,10 +123,8 @@ config COMX_HW_MUNICH Hardware driver for the 'SliceCOM' (channelized E1) and 'PciCOM' boards (X21) from the MultiGate family. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called comx-hw-munich. If you want to compile it - as a module, say M here and read Documentation/modules.txt. + To compile this driver as a module, choose M here: the + module will be called comx-hw-munich. Read linux/Documentation/networking/slicecom.txt for help on configuring and using SliceCOM interfaces. Further info on these cards @@ -146,8 +138,7 @@ config COMX_PROTO_PPP boards. Say Y if you want to use either protocol on your MultiGate boards. - If you want to compile this as a module, say M and read - <file:Documentation/modules.txt>. The module will be called + To compile this as a module, choose M here: the module will be called comx-proto-ppp. config COMX_PROTO_LAPB @@ -157,8 +148,7 @@ config COMX_PROTO_LAPB LAPB protocol driver for all MultiGate boards. Say Y if you want to use this protocol on your MultiGate boards. - If you want to compile this as a module, say M and read - <file:Documentation/modules.txt>. The module will be called + To compile this as a module, choose M here: the module will be called comx-proto-lapb. config COMX_PROTO_FR @@ -168,8 +158,7 @@ config COMX_PROTO_FR Frame Relay protocol driver for all MultiGate boards. Say Y if you want to use this protocol on your MultiGate boards. - If you want to compile this as a module, say M and read - <file:Documentation/modules.txt>. The module will be called + To compile this as a module, choose M here: the module will be called comx-proto-fr. config DSCC4 @@ -181,10 +170,8 @@ config DSCC4 ports card. Take a look at <http://www.cogenit.fr/dscc4/> for further informations about the driver and his configuration. - The driver will be compiled as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called dscc4. For general information about - modules read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called dscc4. config DSCC4_PCISYNC bool "Etinc PCISYNC features" @@ -237,10 +224,8 @@ config LANMEDIA To change setting such as syncPPP vs cisco HDLC or clock source you will need lmcctl. It is available at <ftp://ftp.lanmedia.com/>. - This code is also available as a module called lmc ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called lmc. # There is no way to detect a Sealevel board. Force it modular config SEALEVEL_4021 @@ -276,9 +261,7 @@ config HDLC Generic HDLC driver currently supports raw HDLC, Cisco HDLC, Frame Relay, synchronous Point-to-Point Protocol (PPP) and X.25. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called hdlc. If unsure, say N here. @@ -377,9 +360,7 @@ config PC300 option below this one and read the file README.mlppp provided by PC300 package. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read Documentation/modules.txt. The module will be + To compile this as a module, choose M here: the module will be called pc300. If you haven't heard about it, it's safe to say N. @@ -407,9 +388,7 @@ config N2 Note that N2csu and N2dds cards are not supported by this driver. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called n2. If unsure, say N here. @@ -422,9 +401,7 @@ config C101 Technologies Co., Ltd. If you have such a card, say Y here and see <http://hq.pm.waw.pl/pub/hdlc/> - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called c101. If unsure, say N here. @@ -439,13 +416,11 @@ config FARSYNC 8Mb/s (128K on V.24) using synchronous PPP, Cisco HDLC, raw HDLC, Frame Relay or X.25/LAPB. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want) - say M here and read <file:Documentation/modules.txt>. - The module will be called farsync and if you want the module to be - automatically loaded when the interface is referenced then you - should add "alias hdlcX farsync" to /etc/modules.conf for each - interface, where X is 0, 1, 2, ... + To compile this driver as a module, choose M here: the module will be + called farsync. If you want the module to be automatically loaded + when the interface is referenced then you should add + "alias hdlcX farsync" to /etc/modules.conf for each interface, where + X is 0, 1, 2, ... config DLCI tristate "Frame relay DLCI support" @@ -463,10 +438,8 @@ config DLCI net-tools package as explained in <file:Documentation/networking/framerelay.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called dlci. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called dlci. config DLCI_COUNT int "Max open DLCI" @@ -496,10 +469,8 @@ config SDLA only frame relay is supported by the driver at this time. Please read <file:Documentation/framerelay.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sdla. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called sdla. # Wan router core. config WAN_ROUTER_DRIVERS @@ -546,10 +517,8 @@ config VENDOR_SANGOMA <file:Documentation/networking/wanpipe.txt>. The next questions will ask you about the protocols you want the driver to support. - The driver will be compiled as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called wanpipe. For general information about - modules read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will + be called wanpipe. config WANPIPE_CHDLC bool "WANPIPE Cisco HDLC support" @@ -638,10 +607,8 @@ config CYCLADES_SYNC additional details, I hope to have documentation available as soon as possible. (Cyclades Brazil is writing the Documentation). - The driver will be compiled as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cyclomx. For general information about - modules read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module will be + called cyclomx. config CYCLOMX_X25 bool "Cyclom 2X X.25 support (EXPERIMENTAL)" @@ -664,9 +631,7 @@ config LAPBETHER need to say Y or M to the driver for your Ethernet card as well as to "LAPB Data Link Driver". - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called lapbether. If unsure, say N. config X25_ASY @@ -679,9 +644,7 @@ config X25_ASY currently comply with the asynchronous HDLS framing protocols in CCITT recommendation X.25. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called x25_asy. If unsure, say N. config SBNI diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index a9090fe5ab41..e1417e4a6836 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -53,9 +53,7 @@ config STRIP in saying Y to STRIP now, except that it makes the kernel a bit bigger. - You can also compile this as a module ( = code which can be inserted - in and removed from the running kernel whenever you want), say M - here and read <file:Documentation/modules.txt>. The module will be + To compile this as a module, choose M here: the module will be called strip. config ARLAN @@ -97,11 +95,8 @@ config WAVELAN <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. Please read the man pages contained therein. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called wavelan. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> as well - as <file:Documentation/networking/net-modules.txt>. + To compile this driver as a module, choose M here: the module will be + called wavelan. config PCMCIA_WAVELAN tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support" @@ -111,11 +106,8 @@ config PCMCIA_WAVELAN (PC-card) wireless Ethernet networking card to your computer. This driver is for the non-IEEE-802.11 Wavelan cards. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called wavelan_cs. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. - If unsure, say N. + To compile this driver as a module, choose M here: the module will be + called wavelan_cs. If unsure, say N. config PCMCIA_NETWAVE tristate "Xircom Netwave AirSurfer Pcmcia wireless support" @@ -124,11 +116,8 @@ config PCMCIA_NETWAVE Say Y here if you intend to attach this type of PCMCIA (PC-card) wireless Ethernet networking card to your computer. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called netwave_cs. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. - If unsure, say N. + To compile this driver as a module, choose M here: the module will be + called netwave_cs. If unsure, say N. comment "Wireless 802.11 Frequency Hopping cards support" depends on NET_RADIO && PCMCIA @@ -142,11 +131,8 @@ config PCMCIA_RAYCS Please read the file <file:Documentation/networking/ray_cs.txt> for details. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ray_cs. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this driver as a module, choose M here: the module will be + called ray_cs. If unsure, say N. comment "Wireless 802.11b ISA/PCI cards support" depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA) diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 0c28c93443f8..88e418a4cd8d 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@ -24,13 +24,11 @@ config PARPORT It is possible to share a single parallel port among several devices and it is safe to compile all the corresponding drivers into the - kernel. If you want to compile parallel port support as a module - ( = code which can be inserted in and removed from the running - kernel whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called - parport. If you have more than one parallel port and want to - specify which port and IRQ to be used by this driver at module load - time, take a look at <file:Documentation/parport.txt>. + kernel. To compile parallel port support as a module, choose M here: + the module will be called parport. + If you have more than one parallel port and want to specify which + port and IRQ to be used by this driver at module load time, take a + look at <file:Documentation/parport.txt>. If unsure, say Y. @@ -43,11 +41,8 @@ config PARPORT_PC parallel ports. PA-RISC owners should only say Y here if they have a SuperIO parallel port. - This code is also available as a module. If you want to compile it - as a module ( = code which can be inserted in and removed from the - running kernel whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called - parport_pc. + To compile this driver as a module, choose M here: the + module will be called parport_pc. If unsure, say Y. diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 7d2086bd451f..7039665e4d14 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -14,10 +14,8 @@ config HOTPLUG_PCI powered up and running. The file system pcihpfs must be mounted in order to interact with any PCI Hotplug controllers. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called pci_hotplug. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pci_hotplug. When in doubt, say N. @@ -39,10 +37,8 @@ config HOTPLUG_PCI_FAKE Use this module at your own risk. You have been warned! - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called fakephp. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called fakephp. When in doubt, say N. @@ -53,10 +49,8 @@ config HOTPLUG_PCI_COMPAQ Say Y here if you have a motherboard with a Compaq PCI Hotplug controller. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cpqphp. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called cpqphp. When in doubt, say N. @@ -77,10 +71,8 @@ config HOTPLUG_PCI_IBM Say Y here if you have a motherboard with a IBM PCI Hotplug controller. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cpqphp. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called ibmphp. When in doubt, say N. @@ -91,10 +83,8 @@ config HOTPLUG_PCI_ACPI Say Y here if you have a system that supports PCI Hotplug using ACPI. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called acpiphp. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called acpiphp. When in doubt, say N. @@ -114,10 +104,8 @@ config HOTPLUG_PCI_CPCI_ZT5550 Say Y here if you have an Performance Technologies (formerly Intel, formerly just Ziatech) Ziatech ZT5550 CompactPCI system card. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cpcihp_zt5550. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called cpcihp_zt5550. When in doubt, say N. @@ -129,10 +117,8 @@ config HOTPLUG_PCI_CPCI_GENERIC hotswap signal as a bit in a system register that can be read through standard port I/O. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called cpcihp_generic. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called cpcihp_generic. When in doubt, say N. diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index d06cfa73d893..b43e9956439c 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -23,11 +23,8 @@ config PCMCIA for location). Please also read the PCMCIA-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - When compiled this way, there will be modules called pcmcia_core - and ds. If you want to compile it as a module, say M here and - read <file:Documentation/modules.txt>. + To compile this driver as modules, choose M here: the + modules will be called pcmcia_core and ds. config YENTA tristate "CardBus yenta-compatible bridge support" diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig index 874571c0ecfa..391b2c94ca57 100644 --- a/drivers/s390/Kconfig +++ b/drivers/s390/Kconfig @@ -49,10 +49,8 @@ config BLK_DEV_LOOP Note that this loop device has nothing to do with the loopback device used for network connections from the machine to itself. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called loop. + To compile this driver as a module, choose M here: the + module will be called loop. Most users will answer N here. @@ -78,10 +76,8 @@ config BLK_DEV_NBD Note that this has nothing to do with the network file systems NFS or Coda; you can say N here even if you intend to use NFS or Coda. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called nbd. + To compile this driver as a module, choose M here: the + module will be called nbd. If unsure, say N. @@ -98,10 +94,8 @@ config BLK_DEV_RAM Note that the kernel command line option "ramdisk=XX" is now obsolete. For details, read <file:Documentation/ramdisk.txt>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M and read <file:Documentation/modules.txt>. The module will be - called rd. + To compile this driver as a module, choose M here: the + module will be called rd. Most normal users won't need the RAM disk functionality, and can thus say N here. diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig index 9c8e8c14b534..64fd718de4c3 100644 --- a/drivers/s390/net/Kconfig +++ b/drivers/s390/net/Kconfig @@ -42,10 +42,8 @@ config QETH For details please refer to the documentation provided by IBM at <http://www10.software.ibm.com/developerworks/opensource/linux390> - This driver is also available as a module (code which can be - inserted in and removed from the running kernel whenever you - want). If you want to compile it as a module, say 'M' here and - read file Documentation/modules.txt. + To compile this driver as a module, choose M here: the + module will be called qeth. comment "Gigabit Ethernet default settings" diff --git a/drivers/sbus/char/Kconfig b/drivers/sbus/char/Kconfig index 017e98b9d5cc..bba1c80dba48 100644 --- a/drivers/sbus/char/Kconfig +++ b/drivers/sbus/char/Kconfig @@ -8,9 +8,10 @@ config SUN_OPENPROMIO PROM device tree. The driver implements a SunOS-compatible interface and a NetBSD-compatible interface. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M and read <file:Documentation/modules.txt>. If unsure, say Y. + To compile this driver as a module, choose M here: the + module will be called openprom. + + If unsure, say Y. config SUN_MOSTEK_RTC tristate "Mostek real time clock support" diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 65add96b3975..7371e76558ab 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -14,13 +14,12 @@ config SCSI version of the IOMEGA ZIP drive, USB storage devices, Fibre Channel, FireWire storage and the IDE-SCSI emulation driver. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scsi_mod. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt> and - <file:Documentation/scsi/scsi.txt>. However, do not compile this as a - module if your root file system (the one containing the directory /) - is located on a SCSI device. + To compile this driver as a module, choose M here and read + <file:Documentation/scsi/scsi.txt>. + The module will be called scsi_mod. + + However, do not compile this as a module if your root file system + (the one containing the directory /) is located on a SCSI device. config SCSI_PROC_FS bool "legacy /proc/scsi/ support" @@ -47,14 +46,14 @@ config BLK_DEV_SD <http://www.tldp.org/docs.html#howto>. This is NOT for SCSI CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sd_mod. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> and - <file:Documentation/scsi/scsi.txt>. Do not compile this driver as a - module if your root file system (the one containing the directory /) - is located on a SCSI disk. In this case, do not compile the driver - for your SCSI host adapter (below) as a module either. + To compile this driver as a module, choose M here and read + <file:Documentation/scsi/scsi.txt>. + The module will be called sd_mod. + + Do not compile this driver as a module if your root file system + (the one containing the directory /) is located on a SCSI disk. + In this case, do not compile the driver for your SCSI host adapter + (below) as a module either. config CHR_DEV_ST tristate "SCSI tape support" @@ -66,11 +65,8 @@ config CHR_DEV_ST <file:Documentation/scsi/st.txt> in the kernel source. This is NOT for SCSI CD-ROMs. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called st. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> and - <file:Documentation/scsi/scsi.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/scsi/scsi.txt>. The module will be called st. config CHR_DEV_OSST tristate "SCSI OnStream SC-x0 tape support" @@ -91,11 +87,8 @@ config CHR_DEV_OSST Please also have a look at the standard st docu, as most of it applies to osst as well. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called osst. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> and - <file:Documentation/scsi/scsi.txt>. + To compile this driver as a module, choose M here and read + <file:Documentation/scsi/scsi.txt>. The module will be called osst. config BLK_DEV_SR tristate "SCSI CDROM support" @@ -106,11 +99,9 @@ config BLK_DEV_SR <http://www.tldp.org/docs.html#howto>. Also make sure to say Y or M to "ISO 9660 CD-ROM file system support" later. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called sr_mod. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt> and + To compile this driver as a module, choose M here and read <file:Documentation/scsi/scsi.txt>. + The module will be called sr_mod. config BLK_DEV_SR_VENDOR bool "Enable vendor-specific extensions (for SCSI CDROM)" @@ -141,10 +132,9 @@ config CHR_DEV_SG driver software yourself. Please read the file <file:Documentation/scsi/scsi-generic.txt> for more information. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt> and + To compile this driver as a module, choose M here and read <file:Documentation/scsi/scsi.txt>. The module will be called sg. + If unsure, say N. comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs" @@ -249,10 +239,8 @@ config SCSI_7000FASST family. Some information is in the source: <file:drivers/scsi/wd7000.c>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called wd7000. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called wd7000. config SCSI_ACARD tristate "ACARD SCSI support" @@ -260,10 +248,8 @@ config SCSI_ACARD help This driver supports the ACARD 870U/W SCSI host adapter. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called atp870u. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called atp870u. config SCSI_AHA152X tristate "Adaptec AHA152X/2825 support" @@ -277,10 +263,8 @@ config SCSI_AHA152X <http://www.tldp.org/docs.html#howto>. You might also want to read the file <file:Documentation/scsi/aha152x.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called aha152x. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called aha152x. config SCSI_AHA1542 tristate "Adaptec AHA1542 support" @@ -293,10 +277,8 @@ config SCSI_AHA1542 sold under the Adaptec name. If it doesn't work out of the box, you may have to change some settings in <file:drivers/scsi/aha1542.h>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called aha1542. + To compile this driver as a module, choose M here: the + module will be called aha1542. config SCSI_AHA1740 tristate "Adaptec AHA1740 support" @@ -308,10 +290,8 @@ config SCSI_AHA1740 of the box, you may have to change some settings in <file:drivers/scsi/aha1740.h>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called aha1740. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called aha1740. config SCSI_AACRAID tristate "Adaptec AACRAID support (EXPERIMENTAL)" @@ -356,10 +336,8 @@ config SCSI_AIC7XXX_OLD available from <http://www.tldp.org/docs.html#howto>, can also be of great help. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called aic7xxx_old. + To compile this driver as a module, choose M here: the + module will be called aic7xxx_old. source "drivers/scsi/aic7xxx/Kconfig.aic79xx" @@ -372,11 +350,8 @@ config SCSI_DPT_I2O well as the DPT SmartRaid V cards. This is an Adaptec maintained driver by Deanna Bonds. See <file:Documentation/scsi/dpti.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - dpt_i2o. + To compile this driver as a module, choose M here: the + module will be called dpt_i2o. config SCSI_ADVANSYS tristate "AdvanSys SCSI support" @@ -386,11 +361,8 @@ config SCSI_ADVANSYS AdvanSys. It is documented in the kernel source in <file:drivers/scsi/advansys.c>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - advansys. + To compile this driver as a module, choose M here: the + module will be called advansys. config SCSI_IN2000 tristate "Always IN2000 SCSI support" @@ -401,10 +373,8 @@ config SCSI_IN2000 out of the box, you may have to change the jumpers for IRQ or address selection. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called in2000. + To compile this driver as a module, choose M here: the + module will be called in2000. # does not use pci dma and seems to be onboard only for old machines config SCSI_AM53C974 @@ -420,10 +390,8 @@ config SCSI_AM53C974 "Tekram DC390(T) and Am53/79C974 (PCscsi) SCSI support", above. You can pick either one. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called AM53C974. + To compile this driver as a module, choose M here: the + module will be called AM53C974. config SCSI_MEGARAID tristate "AMI MegaRAID support" @@ -432,10 +400,8 @@ config SCSI_MEGARAID This driver supports the AMI MegaRAID 418, 428, 438, 466, 762, 490 and 467 SCSI host adapters. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called megaraid. + To compile this driver as a module, choose M here: the + module will be called megaraid. config SCSI_BUSLOGIC tristate "BusLogic SCSI support" @@ -449,11 +415,8 @@ config SCSI_BUSLOGIC driver does not work correctly without modification, please contact the author, Leonard N. Zubkoff, by email to lnz@dandelion.com. - You can also build this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - but only a single instance may be loaded. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. - The module will be called BusLogic. + To compile this driver as a module, choose M here: the + module will be called BusLogic. config SCSI_OMIT_FLASHPOINT bool "Omit FlashPoint support" @@ -477,10 +440,8 @@ config SCSI_DMX3191D help This is support for Domex DMX3191D SCSI Host Adapters. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called dmx3191d. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called dmx3191d. config SCSI_DTC3280 tristate "DTC3180/3280 SCSI support" @@ -491,10 +452,8 @@ config SCSI_DTC3280 <http://www.tldp.org/docs.html#howto>, and the file <file:Documentation/scsi/dtc3x80.txt>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called dtc. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called dtc. config SCSI_EATA tristate "EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support" @@ -509,10 +468,8 @@ config SCSI_EATA SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called eata. + To compile this driver as a module, choose M here: the + module will be called eata. config SCSI_EATA_TAGGED_QUEUE bool "enable tagged command queueing" @@ -557,10 +514,8 @@ config SCSI_EATA_PIO numerous features. You might want to have a look at the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called eata_pio. + To compile this driver as a module, choose M here: the + module will be called eata_pio. config SCSI_FUTURE_DOMAIN tristate "Future Domain 16xx SCSI/AHA-2920A support" @@ -578,10 +533,8 @@ config SCSI_FUTURE_DOMAIN controller support"). This Future Domain driver works with the older Adaptec AHA-2920A boards with a Future Domain chip on them. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called fdomain. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called fdomain. config SCSI_FD_MCS tristate "Future Domain MCS-600/700 SCSI support" @@ -593,10 +546,8 @@ config SCSI_FD_MCS This driver also supports the Reply SB16/SCSI card (the SCSI part). It supports multiple adapters in the same system. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called fd_mcs. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called fd_mcs. config SCSI_GDTH tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support" @@ -609,10 +560,8 @@ config SCSI_GDTH in the kernel source in <file:drivers/scsi/gdth.c> and <file:drivers/scsi/gdth.h.> - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called gdth. config SCSI_GENERIC_NCR5380 tristate "Generic NCR5380/53c400 SCSI PIO support" @@ -630,10 +579,8 @@ config SCSI_GENERIC_NCR5380 of the box, you may have to change some settings in <file:drivers/scsi/g_NCR5380.h>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called g_NCR5380. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called g_NCR5380. config SCSI_GENERIC_NCR5380_MMIO tristate "Generic NCR5380/53c400 SCSI MMIO support" @@ -646,11 +593,8 @@ config SCSI_GENERIC_NCR5380_MMIO of the box, you may have to change some settings in <file:drivers/scsi/g_NCR5380.h>. - This driver is also available as a module ( = code which can - be inserted in and removed from the running kernel whenever - you want). The module will be called g_NCR5380_mmio. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called g_NCR5380_mmio. config SCSI_GENERIC_NCR53C400 bool "Enable NCR53c400 extensions" @@ -682,10 +626,8 @@ config SCSI_IBMMCA bootparam" or see the documentation of your boot loader about how to pass options to the kernel. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ibmmca. + To compile this driver as a module, choose M here: the + module will be called ibmmca. config IBMMCA_SCSI_ORDER_STANDARD bool "Standard SCSI-order" @@ -745,11 +687,8 @@ config SCSI_IPS without modification please contact the author by email at ipslinux@adaptec.com. - You can build this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - but only a single instance may be loaded. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. - The module will be called ips. + To compile this driver as a module, choose M here: the + module will be called ips. config SCSI_INITIO tristate "Initio 9100U(W) support" @@ -759,10 +698,8 @@ config SCSI_INITIO read the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called initio. + To compile this driver as a module, choose M here: the + module will be called initio. config SCSI_INIA100 tristate "Initio INI-A100U2W support" @@ -772,10 +709,8 @@ config SCSI_INIA100 Please read the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called a100u2w. + To compile this driver as a module, choose M here: the + module will be called a100u2w. config SCSI_PPA tristate "IOMEGA parallel port (ppa - older drives)" @@ -801,10 +736,8 @@ config SCSI_PPA such as a printer; it is safe to compile both drivers into the kernel. - This driver is also available as a module which can be inserted in - and removed from the running kernel whenever you want. To compile - this driver as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called ppa. + To compile this driver as a module, choose M here: the + module will be called ppa. config SCSI_IMM tristate "IOMEGA parallel port (imm - newer drives)" @@ -830,10 +763,8 @@ config SCSI_IMM such as a printer; it is safe to compile both drivers into the kernel. - This driver is also available as a module which can be inserted in - and removed from the running kernel whenever you want. To compile - this driver as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called imm. + To compile this driver as a module, choose M here: the + module will be called imm. config SCSI_IZIP_EPP16 bool "ppa/imm option - Use slow (but safe) EPP-16" @@ -873,10 +804,8 @@ config SCSI_NCR53C406A in the kernel source. Also read the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called NCR53c406. + To compile this driver as a module, choose M here: the + module will be called NCR53c406. config SCSI_NCR_D700 tristate "NCR Dual 700 MCA SCSI support" @@ -1106,10 +1035,8 @@ config SCSI_MCA_53C9X controller based on the NCR 53C94. This driver will allow use of the controller on the 3550, and very possibly others. - If you want to compile this as a module (= code which can be - inserted and removed from the running kernel whenever you want), say - M here and read <file:Documentation/modules.txt>. The module will - be called mca_53c9x. + To compile this driver as a module, choose M here: the + module will be called mca_53c9x. config SCSI_PAS16 tristate "PAS16 SCSI support" @@ -1121,10 +1048,8 @@ config SCSI_PAS16 of the box, you may have to change some settings in <file:drivers/scsi/pas16.h>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called pas16. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pas16. config SCSI_PCI2000 tristate "PCI2000 support" @@ -1134,10 +1059,8 @@ config SCSI_PCI2000 SCSI host adapter. Please read the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module called pci2000 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pci2000. config SCSI_PCI2220I tristate "PCI2220i support" @@ -1147,10 +1070,8 @@ config SCSI_PCI2220I SCSI host adapter. Please read the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module called pci2220i ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pci2220i. config SCSI_PSI240I tristate "PSI240i support" @@ -1160,10 +1081,8 @@ config SCSI_PSI240I SCSI host adapter. Please read the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module called psi240i ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called psi240i. config SCSI_QLOGIC_FAS tristate "Qlogic FAS SCSI support" @@ -1182,10 +1101,8 @@ config SCSI_QLOGIC_FAS SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called qlogicfas. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called qlogicfas. config SCSI_QLOGIC_ISP tristate "Qlogic ISP SCSI support" @@ -1202,10 +1119,8 @@ config SCSI_QLOGIC_ISP should also read the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called qlogicisp. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called qlogicisp. config SCSI_QLOGIC_FC tristate "Qlogic ISP FC SCSI support" @@ -1213,10 +1128,8 @@ config SCSI_QLOGIC_FC help This is a driver for the QLogic ISP2100 SCSI-FCP host adapter. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called qlogicfc. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called qlogicfc. config SCSI_QLOGIC_FC_FIRMWARE bool "Include loadable firmware in driver" @@ -1232,10 +1145,8 @@ config SCSI_QLOGIC_1280 help Say Y if you have a QLogic ISP1x80/1x160 SCSI host adapter. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called qla1280. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called qla1280. config SCSI_QLOGIC_1280_PIO bool "Use PIO instead of MMIO" if !X86_VISWS @@ -1256,10 +1167,8 @@ config SCSI_QLOGICPTI PTI,ptisp or QLGC,isp. Note that PCI QLogic SCSI controllers are driven by a different driver. - This support is also available as a module called qlogicpti ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called qlogicpti. config SCSI_SEAGATE tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support" @@ -1271,10 +1180,8 @@ config SCSI_SEAGATE doesn't work out of the box, you may have to change some settings in <file:drivers/scsi/seagate.h>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called seagate. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called seagate. # definitely looks not 64bit safe: config SCSI_SIM710 @@ -1305,11 +1212,8 @@ config SCSI_SYM53C416 insmod sym53c416 sym53c416=<base>,<irq> [sym53c416_1=<base>,<irq>] - There is support for up to four adapters. If you want to compile - this driver as a module ( = code which can be inserted in and - removed from the running kernel whenever you want), say M here and - read <file:Documentation/modules.txt>. The module will be called - sym53c416. + To compile this driver as a module, choose M here: the + module will be called sym53c416. config SCSI_DC395x tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support (EXPERIMENTAL)" @@ -1323,10 +1227,8 @@ config SCSI_DC395x Documentation can be found in <file:Documentation/scsi/dc395x.txt>. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called dc395x. + To compile this driver as a module, choose M here: the + module will be called dc395x. config SCSI_DC390T tristate "Tekram DC390(T) and Am53/79C974 SCSI support" @@ -1343,10 +1245,8 @@ config SCSI_DC390T Also note that there is another generic Am53C974 driver, "AM53/79C974 PCI SCSI support" below. You can pick either one. - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called tmscsim. + To compile this driver as a module, choose M here: the + module will be called tmscsim. config SCSI_DC390T_NOGENSUPP bool "_omit_ support for non-DC390 adapters" @@ -1377,10 +1277,8 @@ config SCSI_T128 Adaptec, and some former Trantor products are being sold under the Adaptec name. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called t128. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called t128. config SCSI_U14_34F tristate "UltraStor 14F/34F support" @@ -1396,10 +1294,8 @@ config SCSI_U14_34F below. You should say Y to both only if you want 24F support as well. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called u14-34f. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called u14-34f. config SCSI_U14_34F_TAGGED_QUEUE bool "enable tagged command queueing" @@ -1447,10 +1343,8 @@ config SCSI_ULTRASTOR Note that there is also another driver for the same hardware: "UltraStor 14F/34F support", above. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ultrastor. + To compile this driver as a module, choose M here: the + module will be called ultrastor. config SCSI_NSP32 tristate "Workbit NinjaSCSI-32Bi/UDE support" @@ -1460,10 +1354,8 @@ config SCSI_NSP32 SCSI host adapter. Please read the SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called nsp32. + To compile this driver as a module, choose M here: the + module will be called nsp32. config SCSI_DEBUG tristate "SCSI debugging host simulator" @@ -1485,10 +1377,10 @@ config SCSI_MESH Many Power Macintoshes and clones have a MESH (Macintosh Enhanced SCSI Hardware) SCSI bus adaptor (the 7200 doesn't, but all of the other Power Macintoshes do). Say Y to include support for this SCSI - adaptor. This driver is also available as a module called mesh - ( = code which can be inserted in and removed from the running - kernel whenever you want). If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + adaptor. + + To compile this driver as a module, choose M here: the + module will be called mesh. config SCSI_MESH_SYNC_RATE int "maximum synchronous transfer rate (MB/s) (0 = async)" @@ -1518,10 +1410,8 @@ config SCSI_MAC53C94 machines which only have one SCSI bus, such as the 7200, also use the 53C94. Say Y to include support for the 53C94. - This driver is also available as a module called mac53c94 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called mac53c94. source "drivers/scsi/arm/Kconfig" @@ -1538,11 +1428,10 @@ config A3000_SCSI depends on AMIGA && SCSI help If you have an Amiga 3000 and have SCSI devices connected to the - built-in SCSI controller, say Y. Otherwise, say N. This driver is - also available as a module ( = code which can be inserted in and - removed from the running kernel whenever you want). The module is - called wd33c93. If you want to compile it as a module, say M here - and read <file:Documentation/modules.txt>. + built-in SCSI controller, say Y. Otherwise, say N. + + To compile this driver as a module, choose M here: the + module will be called wd33c93. config A4000T_SCSI bool "A4000T SCSI support (EXPERIMENTAL)" @@ -1555,10 +1444,10 @@ config A2091_SCSI depends on ZORRO && SCSI help If you have a Commodore A2091 SCSI controller, say Y. Otherwise, - say N. This driver is also available as a module ( = code which can - be inserted in and removed from the running kernel whenever you - want). The module is called wd33c93. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + say N. + + To compile this driver as a module, choose M here: the + module will be called wd33c93. config GVP11_SCSI tristate "GVP Series II WD33C93A support" @@ -1570,10 +1459,8 @@ config GVP11_SCSI answer N. This driver does NOT work for the T-Rex series of accelerators from TekMagic and GVP-M. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you - want). The module will be called gvp11. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called gvp11. config CYBERSTORM_SCSI tristate "CyberStorm SCSI support" @@ -1652,14 +1539,15 @@ config ATARI_SCSI ---help--- If you have an Atari with built-in NCR5380 SCSI controller (TT, Falcon, ...) say Y to get it supported. Of course also, if you have - a compatible SCSI controller (e.g. for Medusa). This driver is also - available as a module ( = code which can be inserted in and removed - from the running kernel whenever you want). The module is called - atari_scsi. If you want to compile it as a module, say M here and - read <file:Documentation/modules.txt>. This driver supports both - styles of NCR integration into the system: the TT style (separate - DMA), and the Falcon style (via ST-DMA, replacing ACSI). It does - NOT support other schemes, like in the Hades (without DMA). + a compatible SCSI controller (e.g. for Medusa). + + To compile this driver as a module, choose M here: the + module will be called atari_scsi. + + This driver supports both styles of NCR integration into the + system: the TT style (separate DMA), and the Falcon style (via + ST-DMA, replacing ACSI). It does NOT support other schemes, like + in the Hades (without DMA). config ATARI_SCSI_TOSHIBA_DELAY bool "Long delays for Toshiba CD-ROMs" @@ -1704,10 +1592,8 @@ config SCSI_MAC_ESP SCSI-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called mac_esp. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called mac_esp. config MVME147_SCSI bool "WD33C93 SCSI driver for MVME147" @@ -1764,10 +1650,8 @@ config SCSI_SUNESP This is the driver for the Sun ESP SCSI host adapter. The ESP chipset is present in most SPARC SBUS-based computers. - This support is also available as a module called esp ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called esp. config SCSI_PC980155 tristate "NEC PC-9801-55 SCSI support" diff --git a/drivers/scsi/aacraid/README b/drivers/scsi/aacraid/README index 85b51dbd0003..827c1dd78ff4 100644 --- a/drivers/scsi/aacraid/README +++ b/drivers/scsi/aacraid/README @@ -10,10 +10,10 @@ the original). Supported Cards/Chipsets ------------------------- - Dell Computer Corporation PERC 2 Quad Channel - Dell Computer Corporation PERC 2/Si - Dell Computer Corporation PERC 3/Si - Dell Computer Corporation PERC 3/Di + Dell PERC 2 Quad Channel + Dell PERC 2/Si + Dell PERC 3/Si + Dell PERC 3/Di HP NetRAID-4M ADAPTEC 2120S ADAPTEC 2200S diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx index 450b0fd1ecfd..f5d76019bdc5 100644 --- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx +++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx @@ -10,10 +10,8 @@ config SCSI_AIC7XXX SCSI controllers (the 274x and 284x series). For AAA and ARO based configurations, only SCSI functionality is provided. - If you want to compile the driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called aic7xxx. + To compile this driver as a module, choose M here: the + module will be called aic7xxx. config AIC7XXX_CMDS_PER_DEVICE int "Maximum number of TCQ commands per device" diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig index 4eda8c41cff5..516014a5c81b 100644 --- a/drivers/scsi/pcmcia/Kconfig +++ b/drivers/scsi/pcmcia/Kconfig @@ -12,10 +12,8 @@ config PCMCIA_AHA152X Say Y here if you intend to attach this type of PCMCIA SCSI host adapter to your computer. - This driver is also available as a module called aha152x_cs ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called aha152x_cs. config PCMCIA_FDOMAIN tristate "Future Domain PCMCIA support" @@ -24,10 +22,8 @@ config PCMCIA_FDOMAIN Say Y here if you intend to attach this type of PCMCIA SCSI host adapter to your computer. - This driver is also available as a module called fdomain_cs ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called fdomain_cs. config PCMCIA_NINJA_SCSI tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support" @@ -60,10 +56,8 @@ config PCMCIA_NINJA_SCSI HP M820e CDRW's card etc. - This driver is also available as a module called nsp_cs ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called nsp_cs. config PCMCIA_QLOGIC tristate "Qlogic PCMCIA support" @@ -72,9 +66,7 @@ config PCMCIA_QLOGIC Say Y here if you intend to attach this type of PCMCIA SCSI host adapter to your computer. - This driver is also available as a module called qlogic_cs ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called qlogic_cs. endmenu diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 2bd0ee80e138..08d7cd49ca2b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1108,14 +1108,26 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname, /* cautiously ask */ res = sd_do_mode_sense(SRpnt, dbd, modepage, buffer, 4, &data); - if (scsi_status_is_good(res)) { - /* that went OK, now ask for the proper length */ - len = data.length; - if (len > 128) - len = 128; - res = sd_do_mode_sense(SRpnt, dbd, modepage, buffer, - len, &data); - } + if (!scsi_status_is_good(res)) + goto bad_sense; + + /* that went OK, now ask for the proper length */ + len = data.length; + + /* + * We're only interested in the first three bytes, actually. + * But the data cache page is defined for the first 20. + */ + if (len < 3) + goto bad_sense; + if (len > 20) + len = 20; + + /* Take headers and block descriptors into account */ + len += data.header_length + data.block_descriptor_length; + + /* Get the data */ + res = sd_do_mode_sense(SRpnt, dbd, modepage, buffer, len, &data); if (scsi_status_is_good(res)) { const char *types[] = { @@ -1133,23 +1145,26 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname, printk(KERN_NOTICE "SCSI device %s: drive cache: %s\n", diskname, types[ct]); + + return; + } + +bad_sense: + if ((SRpnt->sr_sense_buffer[0] & 0x70) == 0x70 + && (SRpnt->sr_sense_buffer[2] & 0x0f) == ILLEGAL_REQUEST + /* ASC 0x24 ASCQ 0x00: Invalid field in CDB */ + && SRpnt->sr_sense_buffer[12] == 0x24 + && SRpnt->sr_sense_buffer[13] == 0x00) { + printk(KERN_NOTICE "%s: cache data unavailable\n", + diskname); } else { - if ((SRpnt->sr_sense_buffer[0] & 0x70) == 0x70 - && (SRpnt->sr_sense_buffer[2] & 0x0f) == ILLEGAL_REQUEST - /* ASC 0x24 ASCQ 0x00: Invalid field in CDB */ - && SRpnt->sr_sense_buffer[12] == 0x24 - && SRpnt->sr_sense_buffer[13] == 0x00) { - printk(KERN_NOTICE "%s: cache data unavailable\n", - diskname); - } else { - printk(KERN_ERR "%s: asking for cache data failed\n", - diskname); - } - printk(KERN_ERR "%s: assuming drive cache: write through\n", + printk(KERN_ERR "%s: asking for cache data failed\n", diskname); - sdkp->WCE = 0; - sdkp->RCD = 0; } + printk(KERN_ERR "%s: assuming drive cache: write through\n", + diskname); + sdkp->WCE = 0; + sdkp->RCD = 0; } /** diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 1fa81a3c83df..b514f5dccc91 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -21,9 +21,8 @@ config SERIAL_8250 serial port drivers do not need this driver built in for them to work.) - If you want to compile this driver as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - serial. + To compile this driver as a module, choose M here: the + module will be called serial. [WARNING: Do not compile this driver as a module if you are using non-standard serial ports, since the configuration information will be lost when the driver is unloaded. This limitation may be lifted @@ -72,10 +71,9 @@ config SERIAL_8250_CS multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are credit-card size devices often used with laptops.) - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called serial_cs. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called serial_cs. + If unsure, say N. config SERIAL_8250_ACPI diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig index b162876c83f7..7625b1816baf 100644 --- a/drivers/telephony/Kconfig +++ b/drivers/telephony/Kconfig @@ -13,10 +13,8 @@ config PHONE Note: this has nothing to do with modems. You do not need to say Y here in order to be able to use a modem under Linux. - This support is also available as a module. If you want to compile - it as a module, say M here and read - <file:Documentation/modules.txt>. The module will be called - phonedev. + To compile this driver as a module, choose M here: the + module will be called phonedev. config PHONE_IXJ tristate "QuickNet Internet LineJack/PhoneJack support" diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 8d09cccc1430..7beca18247b1 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -33,7 +33,7 @@ config USB It doesn't normally hurt to select them all if you are not certain. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called usbcore. source "drivers/usb/core/Kconfig" @@ -80,7 +80,7 @@ config USB_USS720 Say Y here if you own an USS-720 USB->Parport cable and intend to connect anything other than a printer to it. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called uss720. source "drivers/usb/serial/Kconfig" diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig index 8b82544fc5fe..c8678f10108c 100644 --- a/drivers/usb/class/Kconfig +++ b/drivers/usb/class/Kconfig @@ -11,10 +11,8 @@ config USB_AUDIO Say Y here if you want to connect USB audio equipment such as speakers to your computer's USB port. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called audio. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called audio. comment "USB Bluetooth TTY can only be used with disabled Bluetooth subsystem" depends on USB && BT @@ -36,10 +34,8 @@ config USB_BLUETOOTH_TTY If in doubt, say N here. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called bluetty. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called bluetty. config USB_MIDI tristate "USB MIDI support" @@ -59,10 +55,8 @@ config USB_MIDI * Roland UA-100 * Yamaha MU1000 - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called usb-midi. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called usb-midi. config USB_ACM tristate "USB Modem (CDC ACM) support" @@ -76,10 +70,8 @@ config USB_ACM /proc/bus/usb/devices, then your modem will not work with this driver. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called acm. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called acm. config USB_PRINTER tristate "USB Printer support" @@ -88,8 +80,6 @@ config USB_PRINTER Say Y here if you want to connect a USB printer to your computer's USB port. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called usblp. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called usblp. diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 7439fadfd652..677aebe60996 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -26,10 +26,8 @@ config USB_EHCI_HCD You may want to read <file:Documentation/usb/ehci.txt>. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ehci-hcd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called ehci-hcd. config USB_OHCI_HCD tristate "OHCI HCD support" @@ -44,10 +42,8 @@ config USB_OHCI_HCD based system where you're not sure, the "lspci -v" entry will list the right "prog-if" for your USB controller(s): EHCI, OHCI, or UHCI. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ohci-hcd. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called ohci-hcd. config USB_UHCI_HCD tristate "UHCI HCD (most Intel and VIA) support" @@ -62,10 +58,8 @@ config USB_UHCI_HCD (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo Pro II or Apollo Pro 133). If unsure, say Y. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called uhci-hcd. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called uhci-hcd. config USB_SL811HS tristate "SL811HS support" @@ -75,8 +69,6 @@ config USB_SL811HS If you do not know what this is, please say N. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called hc_sl811. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called hc_sl811. diff --git a/drivers/usb/image/Kconfig b/drivers/usb/image/Kconfig index 4effa35921e8..efe964efe12e 100644 --- a/drivers/usb/image/Kconfig +++ b/drivers/usb/image/Kconfig @@ -14,10 +14,8 @@ config USB_MDC800 To use it create a device node with "mknod /dev/mustek c 180 32" and configure it in your software. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called mdc800. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called mdc800. config USB_SCANNER tristate "USB Scanner support" @@ -27,10 +25,8 @@ config USB_SCANNER USB port. Please read <file:Documentation/usb/scanner.txt> for more information. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called scanner. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called scanner. config USB_MICROTEK tristate "Microtek X6USB scanner support" diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig index 8e53c0a85271..f469397c5780 100644 --- a/drivers/usb/input/Kconfig +++ b/drivers/usb/input/Kconfig @@ -20,7 +20,7 @@ config USB_HID If unsure, say Y. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called hid. comment "Input core support is needed for USB HID input layer or HIDBP support" @@ -102,7 +102,7 @@ config USB_KBD This is almost certainly not what you want. This is mostly useful for embedded applications or simple keyboards. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called usbkbd. If even remotely unsure, say N. @@ -118,7 +118,7 @@ config USB_MOUSE This is almost certainly not what you want. This is mostly useful for embedded applications or simple mice. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called usbmouse. If even remotely unsure, say N. @@ -134,7 +134,7 @@ config USB_AIPTEK (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called aiptek. config USB_WACOM @@ -146,7 +146,7 @@ config USB_WACOM (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called wacom. config USB_KBTAB @@ -158,7 +158,7 @@ config USB_KBTAB (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called kbtab. config USB_POWERMATE @@ -172,7 +172,7 @@ config USB_POWERMATE You can download userspace tools from http://sowerbutts.com/powermate/ - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called powermate. config USB_XPAD @@ -186,6 +186,8 @@ config USB_XPAD For information about how to connect the X-Box pad to USB, see Documentation/input/xpad.txt. - To compile this driver as a module, say M here: the - module will be called xpad. + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called xpad. If you want to compile it as a + module, say M here and read <file:Documentation/modules.txt>. diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig index 89099fe26a3b..4d3efaddecea 100644 --- a/drivers/usb/media/Kconfig +++ b/drivers/usb/media/Kconfig @@ -14,7 +14,7 @@ config USB_DABUSB isochronous transactions. URB's are explained in <file:Documentation/usb/URB.txt>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called dabusb. comment "Video4Linux support is needed for USB Multimedia device support" @@ -31,7 +31,7 @@ config USB_VICAM Information on this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called vicam. config USB_DSBR @@ -49,7 +49,7 @@ config USB_DSBR "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called dsbr100. config USB_IBMCAM @@ -66,7 +66,7 @@ config USB_IBMCAM "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called ibmcam. This camera has several configuration options which @@ -86,7 +86,7 @@ config USB_KONICAWC "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called konicawc. config USB_OV511 @@ -102,7 +102,7 @@ config USB_OV511 Information on this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called ov511. config USB_PWC @@ -141,7 +141,7 @@ config USB_PWC Information on this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called pwc. config USB_SE401 @@ -157,7 +157,7 @@ config USB_SE401 Information on this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called se401. config USB_STV680 @@ -174,6 +174,6 @@ config USB_STV680 Information on this API and pointers to "v4l" programs may be found on the WWW at <http://roadrunner.swansea.uk.linux.org/v4l.shtml>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called stv680. diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index 963a80a2177c..c2cd1249c267 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig @@ -14,10 +14,8 @@ config USB_EMI26 After firmware load the device is handled with standard linux USB Audio driver. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called audio. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called audio. config USB_TIGL tristate "Texas Instruments Graph Link USB (aka SilverLink) cable support" @@ -30,10 +28,8 @@ config USB_TIGL If you enable this driver, you will be able to communicate with your calculator through a set of device nodes under /dev. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called tiglusb. If you want to compile it as a - module, say M here and read Documentation/modules.txt. + To compile this driver as a module, choose M here: the + module will be called tiglusb. If you don't know what the SilverLink cable is or what a Texas Instruments graphing calculator is, then you probably don't need this @@ -48,10 +44,8 @@ config USB_AUERSWALD Say Y here if you want to connect an Auerswald USB ISDN Device to your computer's USB port. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called auerswald. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called auerswald. config USB_RIO500 tristate "USB Diamond Rio500 support (EXPERIMENTAL)" @@ -61,10 +55,8 @@ config USB_RIO500 computer's USB port. Please read <file:Documentation/usb/rio.txt> for more information. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called rio500. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rio500. config USB_BRLVGER tristate "Tieman Voyager USB Braille display support (EXPERIMENTAL)" @@ -74,10 +66,8 @@ config USB_BRLVGER Tieman. See <file:Documentation/usb/brlvger.txt> for more information. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called brlvger. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called brlvger. config USB_LCD tristate "USB LCD driver support" @@ -88,10 +78,8 @@ config USB_LCD alphanumeric LCD modules. See <http://www.usblcd.de> for more information. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called usblcd. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called usblcd. config USB_SPEEDTOUCH tristate "Alcatel Speedtouch USB support" @@ -101,10 +89,8 @@ config USB_SPEEDTOUCH modem. In order to use your modem you will need to install some user space tools, see <http://www.linux-usb.org/SpeedTouch/> for details. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called speedtch. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called speedtch. config USB_TEST tristate "USB testing driver (DEVELOPMENT)" diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig index 028b3f9c468e..a1d356bbd0bd 100644 --- a/drivers/usb/net/Kconfig +++ b/drivers/usb/net/Kconfig @@ -23,10 +23,8 @@ config USB_AX8817X_STANDALONE typically on eth0, if it is the only ethernet device, or perhaps on eth1, if you have a PCI or ISA ethernet card installed. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ax8817x.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called ax8817x. config USB_CATC tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)" @@ -44,10 +42,8 @@ config USB_CATC typically on eth0, if it is the only ethernet device, or perhaps on eth1, if you have a PCI or ISA ethernet card installed. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called catc. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called catc. config USB_KAWETH tristate "USB KLSI KL5USB101-based ethernet device support" @@ -86,10 +82,8 @@ config USB_KAWETH typically on eth0, if it is the only ethernet device, or perhaps on eth1, if you have a PCI or ISA ethernet card installed. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called kaweth. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called kaweth. config USB_PEGASUS tristate "USB Pegasus/Pegasus-II based ethernet device support" @@ -102,10 +96,8 @@ config USB_PEGASUS is Pegasus or Pegasus II based then send me (petkan@users.sourceforge.net) vendor and device IDs. - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called pegasus. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pegasus. config USB_RTL8150 tristate "USB RTL8150 based ethernet device support (EXPERIMENTAL)" @@ -115,10 +107,8 @@ config USB_RTL8150 Send me (petkan@users.sourceforge.net) any comments you may have. You can also check for updates at http://pegasus2.sourceforge.net/ - This code is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called rtl8150. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rtl8150. config USB_USBNET tristate "Multi-purpose USB Networking Framework" @@ -151,10 +141,8 @@ config USB_USBNET For more information see <http://www.linux-usb.org/usbnet/>. - This code is also available as a kernel module (code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called usbnet. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called usbnet. comment "USB Host-to-Host Cables" depends on USB_USBNET diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index b1d109c8c133..40c0d46a2ec9 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig @@ -17,7 +17,7 @@ config USB_SERIAL information on the specifics of the different devices that are supported, and on how to use them. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called usbserial. config USB_SERIAL_DEBUG @@ -68,7 +68,7 @@ config USB_SERIAL_BELKIN adaptor (F5U103 is one of the model numbers) or the Peracom single port USB to serial adapter. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called belkin_sa. config USB_SERIAL_WHITEHEAT @@ -78,7 +78,7 @@ config USB_SERIAL_WHITEHEAT Say Y here if you want to use a ConnectTech WhiteHEAT 4 port USB to serial converter device. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called whiteheat. config USB_SERIAL_DIGI_ACCELEPORT @@ -93,7 +93,7 @@ config USB_SERIAL_DIGI_ACCELEPORT This driver works under SMP with the usb-uhci driver. It does not work under SMP with the uhci driver. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called digi_acceleport. config USB_SERIAL_EMPEG @@ -105,7 +105,7 @@ config USB_SERIAL_EMPEG device node. See <file:Documentation/usb/usb-serial.txt> for more tidbits of information. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called empeg. config USB_SERIAL_FTDI_SIO @@ -119,7 +119,7 @@ config USB_SERIAL_FTDI_SIO See <http://ftdi-usb-sio.sourceforge.net/> for more information on this driver and the device. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called ftdi_sio. config USB_SERIAL_VISOR @@ -131,7 +131,7 @@ config USB_SERIAL_VISOR <http://usbvisor.sourceforge.net/> for more information on using this driver. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called visor. config USB_SERIAL_IPAQ @@ -143,7 +143,7 @@ config USB_SERIAL_IPAQ using a USB cradle/cable. For information on using the driver, read <file:Documentation/usb/usb-serial.txt>. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called ipaq. config USB_SERIAL_IR @@ -154,7 +154,7 @@ config USB_SERIAL_IR devices. This is useful if you do not want to use the full IrDA stack. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called ir-usb. config USB_SERIAL_EDGEPORT @@ -180,7 +180,7 @@ config USB_SERIAL_EDGEPORT Edgeport/4 DIN Edgeport/16 Dual - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called io_edgeport. config USB_SERIAL_EDGEPORT_TI @@ -191,7 +191,7 @@ config USB_SERIAL_EDGEPORT_TI Networks (Digi) that are not supported by the io_edgeport driver. This includes the Edgeport/1 device. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called io_ti. config USB_SERIAL_KEYSPAN_PDA @@ -202,7 +202,7 @@ config USB_SERIAL_KEYSPAN_PDA serial converter device. This driver makes use of firmware developed from scratch by Brian Warner. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called keyspan_pda. config USB_SERIAL_KEYSPAN @@ -216,7 +216,7 @@ config USB_SERIAL_KEYSPAN See <http://misc.nu/hugh/keyspan.html> for more information. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called keyspan. config USB_SERIAL_KEYSPAN_MPR @@ -310,7 +310,7 @@ config USB_SERIAL_KLSI Please read <file:Documentation/usb/usb-serial.txt> for more information. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called kl5kusb105. config USB_SERIAL_KOBIL_SCT @@ -328,7 +328,7 @@ config USB_SERIAL_KOBIL_SCT - KAAN Professional Note that you need a current CT-API. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called kobil_sct. config USB_SERIAL_MCT_U232 @@ -341,7 +341,7 @@ config USB_SERIAL_MCT_U232 This driver also works with Sitecom U232-P25 and D-Link DU-H3SP USB BAY devices. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called mct_u232. config USB_SERIAL_PL2303 @@ -351,7 +351,7 @@ config USB_SERIAL_PL2303 Say Y here if you want to use the PL2303 USB Serial single port adapter from Prolific. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called pl2303. config USB_SERIAL_SAFE @@ -370,7 +370,7 @@ config USB_SERIAL_CYBERJACK reader. This is an interface to ISO 7816 compatible contactbased chipcards, e.g. GSM SIMs. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called cyberjack. If unsure, say N. @@ -383,7 +383,7 @@ config USB_SERIAL_XIRCOM serial converter device. This driver makes use of firmware developed from scratch by Brian Warner. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called keyspan_pda. config USB_SERIAL_OMNINET @@ -392,7 +392,7 @@ config USB_SERIAL_OMNINET help Say Y here if you want to use a ZyXEL omni.net LCD ISDN TA. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called omninet. config USB_EZUSB diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig index 1ab4b8ed0d0c..724a4a160342 100644 --- a/drivers/usb/storage/Kconfig +++ b/drivers/usb/storage/Kconfig @@ -15,7 +15,7 @@ config USB_STORAGE similar devices. This driver may also be used for some cameras and card readers. - To compile this driver as a module, say M here: the + To compile this driver as a module, choose M here: the module will be called usb-storage. config USB_STORAGE_DEBUG diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index ee4def82a3ba..4836a8632886 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -158,10 +158,8 @@ config FB_AMIGA This is the frame buffer device driver for the builtin graphics chipset found in Amigas. - The driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called amifb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called amifb. config FB_AMIGA_OCS bool "Amiga OCS chipset support" @@ -288,11 +286,8 @@ config FB_VGA16 This is the frame buffer device driver for VGA 16 color graphic cards. Say Y if you have such a card. - This code is also available as a module. If you want to compile it - as a module ( = code which can be inserted in and removed from the - running kernel whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called - vga16fb. + To compile this driver as a module, choose M here: the + module will be called vga16fb. config FB_STI tristate "HP STI frame buffer device support" @@ -348,10 +343,8 @@ config FB_HGA help Say Y here if you have a Hercules mono graphics card. - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). - The module will be called hgafb. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called hgafb. As this card technology is 15 years old, most people will answer N here. @@ -404,10 +397,8 @@ config FB_PVR2 This driver may or may not work on other PowerVR 2 cards, but is totally untested. Use at your own risk. If unsure, say N. - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). - The module will be called pvr2fb. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called pvr2fb. You can pass several parameters to the driver at boot time or at module load time. The parameters look like "video=pvr2:XXX", where @@ -460,10 +451,8 @@ config FB_RIVA chips. Say Y if you have such a graphics board. - The driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called rivafb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rivafb. config FB_I810 tristate "Intel 810/815 support (EXPERIMENTAL)" @@ -472,10 +461,8 @@ config FB_I810 This driver supports the on-board graphics built in to the Intel 810 and 815 chipsets. Say Y if you have and plan to use such a board. - The driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). - The module will be called i810fb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called i810fb. For more information, please read <file:Documentation/fb/intel810.txt> @@ -512,10 +499,8 @@ config FB_MATROX Mystique G200, Matrox Millennium G200, Matrox Marvel G200 video, Matrox G400, G450 or G550 card in your box. - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). - The module will be called matroxfb. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called matroxfb. You can pass several parameters to the driver at boot time or at module load time. The parameters look like "video=matrox:XXX", and @@ -677,10 +662,8 @@ config FB_ATY128 Say Y if you have such a graphics board and read <file:Documentation/fb/aty128fb.txt>. - The driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called aty128fb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called aty128fb. config FB_ATY tristate "ATI Mach64 display support" if PCI || ATARI @@ -689,10 +672,8 @@ config FB_ATY This driver supports graphics boards with the ATI Mach64 chips. Say Y if you have such a graphics board. - The driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called atyfb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called atyfb. config FB_ATY_CT bool "Mach64 CT/VT/GT/LT (incl. 3D RAGE) support" @@ -750,10 +731,8 @@ config FB_NEOMAGIC This driver supports notebooks with NeoMagic PCI chips. Say Y if you have such a graphics card. - The driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called neofb. If you want to compile it as a - module, say M here and read Documentation/modules.txt. + To compile this driver as a module, choose M here: the + module will be called neofb. config FB_3DFX tristate "3Dfx Banshee/Voodoo3 display support" @@ -762,10 +741,8 @@ config FB_3DFX This driver supports graphics boards with the 3Dfx Banshee/Voodoo3 chips. Say Y if you have such a graphics board. - The driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called tdfxfb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called tdfxfb. config FB_VOODOO1 tristate "3Dfx Voodoo Graphics (sst1) support" @@ -774,10 +751,8 @@ config FB_VOODOO1 Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or Voodoo2 (cvg) based graphics card. - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). - The module will be called sstfb. If you want to compile it as - a module, say M here and read Documentation/modules.txt. + To compile this driver as a module, choose M here: the + module will be called sstfb. WARNING: Do not use any application that uses the 3D engine (namely glide) while using this driver. @@ -795,10 +770,8 @@ config FB_TRIDENT Say Y if you have such a graphics board. - The driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called tridentfb. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called tridentfb. config FB_PM3 tristate "Permedia3 support" @@ -921,10 +894,8 @@ config FB_VIRTUAL the innocent, it has to be enabled explicitly at boot time using the kernel option `video=vfb:'. - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). The - module will be called vfb. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called vfb. If unsure, say N. if VT diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 16dda5808429..475c31327810 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -51,10 +51,8 @@ config MDA_CONSOLE say Y here if your MDA card is the primary card in your system; the normal VGA driver will handle it. - This driver is also available as a module ( = code which can be - inserted and removed from the running kernel whenever you want). - The module will be called mdacon. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called mdacon. If unsure, say N. diff --git a/fs/Kconfig b/fs/Kconfig index 63ec317c1ee0..5ed55df5c1c5 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -43,9 +43,7 @@ config EXT2_FS available from <http://jnewbigin-pc.it.swin.edu.au/Linux/Explore2fs.htm>. - If you want to compile this file system as a module ( = code which - can be inserted in and removed from the running kernel whenever you - want), say M here and read <file:Documentation/modules.txt>. The + To compile this file system support as a module, choose M here: the module will be called ext2. Be aware however that the file system of your root partition (the one containing the directory /) cannot be compiled as a module, and so this could be dangerous. Most @@ -111,9 +109,7 @@ config EXT3_FS e2fsprogs version 1.20 or later in order to create ext3 journals (available at <http://sourceforge.net/projects/e2fsprogs/>). - If you want to compile this file system as a module ( = code which - can be inserted in and removed from the running kernel whenever you - want), say M here and read <file:Documentation/modules.txt>. The + To compile this file system support as a module, choose M here: the module will be called ext3. Be aware however that the file system of your root partition (the one containing the directory /) cannot be compiled as a module, and so this may be dangerous. @@ -170,11 +166,9 @@ config JBD If you are using the ext3 file system, you need to say Y here. If you are not using ext3 then you will probably want to say N. - If you want to compile this device as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called jbd. If you are compiling ext3 into the kernel, - you cannot compile this code as a module. + To compile this device as a module, choose M here: the module will be + called jbd. If you are compiling ext3 into the kernel, you cannot + compile this code as a module. config JBD_DEBUG bool "JBD (ext3) debugging support" @@ -310,9 +304,7 @@ config XFS_FS for complete details. This implementation is on-disk compatible with the IRIX version of XFS. - If you want to compile this file system as a module ( = code which - can be inserted in and removed from the running kernel whenever you - want), say M here and read <file:Documentation/modules.txt>. The + To compile this file system support as a module, choose M here: the module will be called xfs. Be aware, however, that if the file system of your root partition is compiled as a module, you'll need to use an initial ramdisk (initrd) to boot. @@ -375,10 +367,8 @@ config MINIX_FS on older Linux floppy disks. This option will enlarge your kernel by about 28 KB. If unsure, say N. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called minix. Note that the file system of your root + To compile this file system support as a module, choose M here: the + module will be called minix. Note that the file system of your root partition (the one containing the directory /) cannot be compiled as a module. @@ -390,11 +380,8 @@ config ROMFS_FS other read-only media as well. Read <file:Documentation/filesystems/romfs.txt> for details. - This file system support is also available as a module ( = code - which can be inserted in and removed from the running kernel - whenever you want). The module is called romfs. If you want to - compile it as a module, say M here and read - <file:Documentation/modules.txt>. Note that the file system of your + To compile this file system support as a module, choose M here: the + module will be called romfs. Note that the file system of your root partition (the one containing the directory /) cannot be a module. @@ -450,10 +437,8 @@ config AUTOFS_FS features, say N here and say Y to "Kernel automounter v4 support", below. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called autofs. + To compile this support as a module, choose M here: the module will be + called autofs. If you are not a part of a fairly large, distributed network, you probably do not need an automounter, and can say N here. @@ -470,11 +455,9 @@ config AUTOFS4_FS <ftp://ftp.kernel.org/pub/linux/daemons/autofs/testing-v4/>; you also want to answer Y to "NFS file system support", below. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called autofs4. You will need to add "alias autofs - autofs4" to your modules configuration file. + To compile this support as a module, choose M here: the module will be + called autofs4. You will need to add "alias autofs autofs4" to your + modules configuration file. If you are not a part of a fairly large, distributed network or don't have a laptop which needs to dynamically reconfigure to the @@ -496,10 +479,8 @@ config ISO9660_FS available from <http://www.tldp.org/docs.html#howto>), thereby enlarging your kernel by about 27 KB; otherwise say N. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called isofs. + To compile this file system support as a module, choose M here: the + module will be called isofs. config JOLIET bool "Microsoft Joliet CDROM extensions" @@ -537,11 +518,8 @@ config UDF_FS if written to by other UDF utilities, such as DirectCD. Please read <file:Documentation/filesystems/udf.txt>. - This file system support is also available as a module ( = code - which can be inserted in and removed from the running kernel - whenever you want). The module is called udf. If you want to - compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this file system support as a module, choose M here: the + module will be called udf. If unsure, say N. @@ -582,12 +560,10 @@ config FAT_FS The FAT support will enlarge your kernel by about 37 KB. If unsure, say Y. - If you want to compile this as a module however ( = code which can - be inserted in and removed from the running kernel whenever you - want), say M here and read <file:Documentation/modules.txt>. The - module will be called fat. Note that if you compile the FAT - support as a module, you cannot compile any of the FAT-based file - systems into the kernel -- they will have to be modules as well. + To compile this as a module, choose M here: the module will be called + fat. Note that if you compile the FAT support as a module, you + cannot compile any of the FAT-based file systems into the kernel + -- they will have to be modules as well. The file system of your root partition (the one containing the directory /) cannot be a module, so don't say M here if you intend to use UMSDOS as your root file system. @@ -618,11 +594,8 @@ config MSDOS_FS This option will enlarge your kernel by about 7 KB. If unsure, answer Y. This will only work if you said Y to "DOS FAT fs support" - as well. If you want to compile this as a module however ( = code - which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. - The module will be called msdos. + as well. To compile this as a module, choose M here: the module will + be called msdos. config VFAT_FS tristate "VFAT (Windows-95) fs support" @@ -643,10 +616,8 @@ config VFAT_FS the file <file:Documentation/filesystems/vfat.txt> for details. If unsure, say Y. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called vfat. + To compile this as a module, choose M here: the module will be called + vfat. config UMSDOS_FS #dep_tristate ' UMSDOS: Unix-like file system on top of standard MSDOS fs' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS @@ -672,39 +643,49 @@ config UMSDOS_FS This option enlarges your kernel by about 28 KB and it only works if you said Y to both "DOS FAT fs support" and "MSDOS fs support" - above. If you want to compile this as a module ( = code which can - be inserted in and removed from the running kernel whenever you - want), say M here and read <file:Documentation/modules.txt>. The - module will be called umsdos. Note that the file system of your - root partition (the one containing the directory /) cannot be a - module, so saying M could be dangerous. If unsure, say N. + above. To compile this as a module, choose M here: the module will be + called umsdos. Note that the file system of your root partition + (the one containing the directory /) cannot be a module, so saying M + could be dangerous. If unsure, say N. config NTFS_FS - tristate "NTFS file system support (read only)" + tristate "NTFS file system support" help - NTFS is the file system of Microsoft Windows NT/2000/XP. For more - information see <file:Documentation/filesystems/ntfs.txt>. Saying Y - here would allow you to read from NTFS partitions. + NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003. + + Saying Y or M here enables read support. There is partial, but + safe, write support available. For write support you must also + say Y to "NTFS write support" below. + + There are also a number of user-space tools available, called + ntfsprogs. These include ntfsundelete and ntfsresize, that work + without NTFS support enabled in the kernel. + + This is a rewrite from scratch of Linux NTFS support and replaced + the old NTFS code starting with Linux 2.5.11. A backport to + the Linux 2.4 kernel series is separately available as a patch + from the project web site. - This file system is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ntfs. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + For more information see <file:Documentation/filesystems/ntfs.txt> + and <http://linux-ntfs.sourceforge.net/>. - If you are not using Windows NT/2000/XP in addition to Linux on your - computer it is safe to say N. + To compile this file system support as a module, choose M here: the + module will be called ntfs. + + If you are not using Windows NT, 2000, XP or 2003 in addition to + Linux on your computer it is safe to say N. config NTFS_DEBUG bool "NTFS debugging support" depends on NTFS_FS help If you are experiencing any problems with the NTFS file system, say - Y here. This will result in additional consistency checks to be + Y here. This will result in additional consistency checks to be performed by the driver as well as additional debugging messages to - be written to the system log. Note that debugging messages are - disabled by default. To enable them, supply the option debug_msgs=1 + be written to the system log. Note that debugging messages are + disabled by default. To enable them, supply the option debug_msgs=1 at the kernel command line when booting the kernel or as an option - to insmod when loading the ntfs module. Once the driver is active, + to insmod when loading the ntfs module. Once the driver is active, you can enable debugging messages by doing (as root): echo 1 > /proc/sys/fs/ntfs-debug Replacing the "1" with "0" would disable debug messages. @@ -717,16 +698,33 @@ config NTFS_DEBUG debugging messages while the misbehaviour was occurring. config NTFS_RW - bool "NTFS write support (DANGEROUS)" - depends on NTFS_FS && EXPERIMENTAL + bool "NTFS write support" + depends on NTFS_FS help - This enables the experimental write support in the NTFS driver. + This enables the partial, but safe, write support in the NTFS driver. + + The only supported operation is overwriting existing files, without + changing the file length. No file or directory creation, deletion or + renaming is possible. Note only non-resident files can be written to + so you may find that some very small files (<500 bytes or so) cannot + be written to. - WARNING: Do not use this option unless you are actively developing - NTFS as it is currently guaranteed to be broken and you - may lose all your data! + While we cannot guarantee that it will not damage any data, we have + so far not received a single report where the driver would have + damaged someones data so we assume it is perfectly safe to use. - It is strongly recommended and perfectly safe to say N here. + Note: While write support is safe in this version (a rewrite from + scratch of the NTFS support), it should be noted that the old NTFS + write support, included in Linux 2.5.10 and before (since 1997), + is not safe. + + This is currently useful with TopologiLinux. TopologiLinux is run + on top of any DOS/Microsoft Windows system without partitioning your + hard disk. Unlike other Linux distributions TopologiLinux does not + need its own partition. For more information see + <http://topologi-linux.sourceforge.net/> + + It is perfectly safe to say N here. endmenu @@ -890,10 +888,8 @@ config RAMFS you need a file system which lives in RAM with limit checking use tmpfs. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ramfs. + To compile this as a module, choose M here: the module will be called + ramfs. endmenu @@ -914,10 +910,8 @@ config ADFS_FS /dev/[hs]d?1) on each of your drives. Please read the file <file:Documentation/filesystems/adfs.txt> for further details. - This code is also available as a module called adfs ( = code which - can be inserted in and removed from the running kernel whenever you - want). If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the module will be + called adfs. If unsure, say N. @@ -948,11 +942,8 @@ config AFFS_FS If you want to do this, you will also need to say Y or M to "Loop device support", above. - This file system is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called affs. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. If unsure, - say N. + To compile this file system support as a module, choose M here: the + module will be called affs. If unsure, say N. config HFS_FS tristate "Apple Macintosh file system support (EXPERIMENTAL)" @@ -963,11 +954,8 @@ config HFS_FS Please read <file:fs/hfs/HFS.txt> to learn about the available mount options. - This file system support is also available as a module ( = code - which can be inserted in and removed from the running kernel - whenever you want). The module is called hfs. If you want to - compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this file system support as a module, choose M here: the + module will be called hfs. config BEFS_FS tristate "BeOS file systemv(BeFS) support (read only) (EXPERIMENTAL)" @@ -985,9 +973,7 @@ config BEFS_FS If you don't know what this is about, say N. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read Documentation/modules.txt. The module will be + To compile this as a module, choose M here: the module will be called befs. config BEFS_DEBUG @@ -1013,12 +999,9 @@ config BFS_FS If you don't know what this is about, say N. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called bfs. Note that the file system of your root - partition (the one containing the directory /) cannot be compiled as - a module. + To compile this as a module, choose M here: the module will be called + bfs. Note that the file system of your root partition (the one + containing the directory /) cannot be compiled as a module. @@ -1034,10 +1017,8 @@ config EFS_FS what all this is about, it's safe to say N. For more information about EFS see its home page at <http://aeschi.ch.eu.org/efs/>. - If you want to compile the EFS file system support as a module ( = - code which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called efs. + To compile the EFS file system support as a module, choose M here: the + module will be called efs. config JFFS_FS tristate "Journalling Flash File System (JFFS) support" @@ -1120,11 +1101,9 @@ config CRAMFS See <file:Documentation/filesystems/cramfs.txt> and <file:fs/cramfs/README> for further information. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called cramfs. Note that the root file system (the one - containing the directory /) cannot be compiled as a module. + To compile this as a module, choose M here: the module will be called + cramfs. Note that the root file system (the one containing the + directory /) cannot be compiled as a module. If unsure, say N. @@ -1141,11 +1120,8 @@ config VXFS_FS fstab(5) is 'vxfs' as it describes the file system format, not the actual driver. - This file system is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called freevxfs. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. If - unsure, say N. + To compile this as a module, choose M here: the module will be + called freevxfs. If unsure, say N. config HPFS_FS @@ -1159,11 +1135,8 @@ config HPFS_FS option in order to be able to read them. Read <file:Documentation/filesystems/hpfs.txt>. - This file system is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called hpfs. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. If unsure, - say N. + To compile this file system support as a module, choose M here: the + module will be called hpfs. If unsure, say N. @@ -1177,11 +1150,8 @@ config QNX4FS_FS Unless you say Y to "QNX4FS read-write support" below, you will only be able to read these file systems. - This file system support is also available as a module ( = code - which can be inserted in and removed from the running kernel - whenever you want). The module is called qnx4. If you want to - compile it as a module, say M here and read - <file:Documentation/modules.txt>. + To compile this file system support as a module, choose M here: the + module will be called qnx4. If you don't know whether you need it, then you don't need it: answer N. @@ -1228,10 +1198,8 @@ config SYSV_FS <file:Documentation/filesystems/sysv-fs.txt>. Saying Y here will enlarge your kernel by about 27 KB. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called sysv. + To compile this as a module, choose M here: the module will be called + sysv. If you haven't heard about all of this before, it's safe to say N. @@ -1261,10 +1229,8 @@ config UFS_FS NeXT character set to the Latin1 character set; use the program recode ("info recode") for this purpose. - If you want to compile the UFS file system support as a module ( = - code which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called ufs. + To compile the UFS file system support as a module, choose M here: the + module will be called ufs. If you haven't heard about all of this before, it's safe to say N. @@ -1302,10 +1268,8 @@ config NFS_FS If you say Y here, you should have said Y to TCP/IP networking also. This option would enlarge your kernel by about 27 KB. - This file system is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called nfs. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + To compile this file system support as a module, choose M here: the + module will be called nfs. If you are configuring a diskless machine which will mount its root file system over NFS at boot time, say Y here and to "Kernel @@ -1360,11 +1324,8 @@ config NFSD Please read the NFS-HOWTO, available from <http://www.tldp.org/docs.html#howto>. - The NFS server is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called nfsd. If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. If unsure, - say N. + To compile the NFS server support as a module, choose M here: the + module will be called nfsd. If unsure, say N. config NFSD_V3 bool "Provide NFSv3 server support" @@ -1469,10 +1430,8 @@ config SMB_FS General information about how to connect Linux, Windows machines and Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. - If you want to compile the SMB support as a module ( = code which - can be inserted in and removed from the running kernel whenever you - want), say M here and read <file:Documentation/modules.txt>. The - module will be called smbfs. Most people say N, however. + To compile the SMB support as a module, choose M here: the module will + be called smbfs. Most people say N, however. config SMB_NLS_DEFAULT bool "Use a default NLS" @@ -1543,11 +1502,8 @@ config NCP_FS General information about how to connect Linux, Windows machines and Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called ncpfs. Say N unless you are connected to a Novell - network. + To compile this as a module, choose M here: the module will be called + ncpfs. Say N unless you are connected to a Novell network. source "fs/ncpfs/Kconfig" @@ -1570,10 +1526,8 @@ config CODA_FS <file:Documentation/filesystems/coda.txt> and check out the Coda home page <http://www.coda.cs.cmu.edu/>. - If you want to compile the coda client support as a module ( = code - which can be inserted in and removed from the running kernel - whenever you want), say M here and read - <file:Documentation/modules.txt>. The module will be called coda. + To compile the coda client support as a module, choose M here: the + module will be called coda. config CODA_FS_OLD_API bool "Use 96-bit Coda file identifiers" diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 776116d958a9..d6d32c87b1c3 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -23,11 +23,9 @@ config BINFMT_ELF ld.so (check the file <file:Documentation/Changes> for location and latest version). - If you want to compile this as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module - will be called binfmt_elf. Saying M or N here is dangerous because - some crucial programs on your system might be in ELF format. + To compile this as a module, choose M here: the module will be called + binfmt_elf. Saying M or N here is dangerous because some crucial + programs on your system might be in ELF format. config BINFMT_FLAT tristate "Kernel support for flat binaries" diff --git a/fs/compat.c b/fs/compat.c index e2eec3eb91ce..06891db071be 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -120,7 +120,12 @@ static int put_compat_statfs(struct compat_statfs *ubuf, struct kstatfs *kbuf) __put_user(kbuf->f_namelen, &ubuf->f_namelen) || __put_user(kbuf->f_fsid.val[0], &ubuf->f_fsid.val[0]) || __put_user(kbuf->f_fsid.val[1], &ubuf->f_fsid.val[1]) || - __put_user(kbuf->f_frsize, &ubuf->f_frsize)) + __put_user(kbuf->f_frsize, &ubuf->f_frsize) || + __put_user(0, &ubuf->f_spare[0]) || + __put_user(0, &ubuf->f_spare[1]) || + __put_user(0, &ubuf->f_spare[2]) || + __put_user(0, &ubuf->f_spare[3]) || + __put_user(0, &ubuf->f_spare[4])) return -EFAULT; return 0; } diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h index 19ce024c2bbc..14c41b651d15 100644 --- a/fs/ntfs/layout.h +++ b/fs/ntfs/layout.h @@ -42,8 +42,8 @@ #define const_cpu_to_le32(x) __constant_cpu_to_le32(x) #define const_cpu_to_le64(x) __constant_cpu_to_le64(x) -/* The NTFS oem_id */ -#define magicNTFS const_cpu_to_le64(0x202020205346544e) /* "NTFS " */ +/* The NTFS oem_id "NTFS " */ +#define magicNTFS const_cpu_to_le64(0x202020205346544eULL) /* * Location of bootsector on partition: diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c index 86e6314bd4d2..f50ff429e53a 100644 --- a/fs/partitions/efi.c +++ b/fs/partitions/efi.c @@ -3,7 +3,7 @@ * Per Intel EFI Specification v1.02 * http://developer.intel.com/technology/efi/efi.htm * efi.[ch] by Matt Domsch <Matt_Domsch@dell.com> - * Copyright 2000,2001,2002 Dell Computer Corporation + * Copyright 2000,2001,2002 Dell Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/fs/partitions/efi.h b/fs/partitions/efi.h index d0eff3120ac8..9b2670e85c76 100644 --- a/fs/partitions/efi.h +++ b/fs/partitions/efi.h @@ -4,7 +4,7 @@ * http://developer.intel.com/technology/efi/efi.htm * * By Matt Domsch <Matt_Domsch@dell.com> Fri Sep 22 22:15:56 CDT 2000 - * Copyright 2000,2001 Dell Computer Corporation + * Copyright 2000,2001 Dell Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/asm-i386/edd.h b/include/asm-i386/edd.h index 66f7246dd13c..3bae533f3d2f 100644 --- a/include/asm-i386/edd.h +++ b/include/asm-i386/edd.h @@ -1,6 +1,6 @@ /* * linux/include/asm-i386/edd.h - * Copyright (C) 2002 Dell Computer Corporation + * Copyright (C) 2002 Dell Inc. * by Matt Domsch <Matt_Domsch@dell.com> * * structures and definitions for the int 13h, ax={41,48}h diff --git a/include/linux/pci-dynids.h b/include/linux/pci-dynids.h index a88652da88f6..183b6b0de81c 100644 --- a/include/linux/pci-dynids.h +++ b/include/linux/pci-dynids.h @@ -1,6 +1,6 @@ /* * PCI defines and function prototypes - * Copyright 2003 Dell Computer Corporation + * Copyright 2003 Dell Inc. * by Matt Domsch <Matt_Domsch@dell.com> */ diff --git a/kernel/futex.c b/kernel/futex.c index 6691f6475869..db0a81a810dd 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -33,7 +33,7 @@ #include <linux/poll.h> #include <linux/fs.h> #include <linux/file.h> -#include <linux/hash.h> +#include <linux/jhash.h> #include <linux/init.h> #include <linux/futex.h> #include <linux/mount.h> @@ -44,6 +44,7 @@ /* * Futexes are matched on equal values of this key. * The key type depends on whether it's a shared or private mapping. + * Don't rearrange members without looking at hash_futex(). */ union futex_key { struct { @@ -79,9 +80,15 @@ struct futex_q { struct file *filp; }; -/* The key for the hash is the address + index + offset within page */ -static struct list_head futex_queues[1<<FUTEX_HASHBITS]; -static spinlock_t futex_lock = SPIN_LOCK_UNLOCKED; +/* + * Split the global futex_lock into every hash list lock. + */ +struct futex_hash_bucket { + spinlock_t lock; + struct list_head chain; +}; + +static struct futex_hash_bucket futex_queues[1<<FUTEX_HASHBITS]; /* Futex-fs vfsmount entry: */ static struct vfsmount *futex_mnt; @@ -89,11 +96,12 @@ static struct vfsmount *futex_mnt; /* * We hash on the keys returned from get_futex_key (see below). */ -static inline struct list_head *hash_futex(union futex_key *key) +static struct futex_hash_bucket *hash_futex(union futex_key *key) { - return &futex_queues[hash_long(key->both.word - + (unsigned long) key->both.ptr - + key->both.offset, FUTEX_HASHBITS)]; + u32 hash = jhash2((u32*)&key->both.word, + (sizeof(key->both.word)+sizeof(key->both.ptr))/4, + key->both.offset); + return &futex_queues[hash & ((1 << FUTEX_HASHBITS)-1)]; } /* @@ -214,6 +222,7 @@ static int get_futex_key(unsigned long uaddr, union futex_key *key) static int futex_wake(unsigned long uaddr, int num) { struct list_head *i, *next, *head; + struct futex_hash_bucket *bh; union futex_key key; int ret; @@ -223,9 +232,10 @@ static int futex_wake(unsigned long uaddr, int num) if (unlikely(ret != 0)) goto out; - head = hash_futex(&key); + bh = hash_futex(&key); + spin_lock(&bh->lock); + head = &bh->chain; - spin_lock(&futex_lock); list_for_each_safe(i, next, head) { struct futex_q *this = list_entry(i, struct futex_q, list); @@ -239,7 +249,7 @@ static int futex_wake(unsigned long uaddr, int num) break; } } - spin_unlock(&futex_lock); + spin_unlock(&bh->lock); out: up_read(¤t->mm->mmap_sem); @@ -254,6 +264,7 @@ static int futex_requeue(unsigned long uaddr1, unsigned long uaddr2, int nr_wake, int nr_requeue) { struct list_head *i, *next, *head1, *head2; + struct futex_hash_bucket *bh1, *bh2; union futex_key key1, key2; int ret; @@ -266,10 +277,19 @@ static int futex_requeue(unsigned long uaddr1, unsigned long uaddr2, if (unlikely(ret != 0)) goto out; - head1 = hash_futex(&key1); - head2 = hash_futex(&key2); + bh1 = hash_futex(&key1); + bh2 = hash_futex(&key2); + if (bh1 < bh2) { + spin_lock(&bh1->lock); + spin_lock(&bh2->lock); + } else { + spin_lock(&bh2->lock); + if (bh1 > bh2) + spin_lock(&bh1->lock); + } + head1 = &bh1->chain; + head2 = &bh2->chain; - spin_lock(&futex_lock); list_for_each_safe(i, next, head1) { struct futex_q *this = list_entry(i, struct futex_q, list); @@ -291,8 +311,14 @@ static int futex_requeue(unsigned long uaddr1, unsigned long uaddr2, } } } - spin_unlock(&futex_lock); - + if (bh1 < bh2) { + spin_unlock(&bh2->lock); + spin_unlock(&bh1->lock); + } else { + if (bh1 > bh2) + spin_unlock(&bh1->lock); + spin_unlock(&bh2->lock); + } out: up_read(¤t->mm->mmap_sem); return ret; @@ -301,28 +327,30 @@ out: static inline void queue_me(struct futex_q *q, union futex_key *key, int fd, struct file *filp) { - struct list_head *head = hash_futex(key); + struct futex_hash_bucket *bh = hash_futex(key); + struct list_head *head = &bh->chain; q->key = *key; q->fd = fd; q->filp = filp; - spin_lock(&futex_lock); + spin_lock(&bh->lock); list_add_tail(&q->list, head); - spin_unlock(&futex_lock); + spin_unlock(&bh->lock); } /* Return 1 if we were still queued (ie. 0 means we were woken) */ static inline int unqueue_me(struct futex_q *q) { + struct futex_hash_bucket *bh = hash_futex(&q->key); int ret = 0; - spin_lock(&futex_lock); + spin_lock(&bh->lock); if (!list_empty(&q->list)) { list_del(&q->list); ret = 1; } - spin_unlock(&futex_lock); + spin_unlock(&bh->lock); return ret; } @@ -332,8 +360,8 @@ static int futex_wait(unsigned long uaddr, int val, unsigned long time) int ret, curval; union futex_key key; struct futex_q q; + struct futex_hash_bucket *bh = NULL; - try_again: init_waitqueue_head(&q.waiters); down_read(¤t->mm->mmap_sem); @@ -367,25 +395,26 @@ static int futex_wait(unsigned long uaddr, int val, unsigned long time) /* * There might have been scheduling since the queue_me(), as we * cannot hold a spinlock across the get_user() in case it - * faults. So we cannot just set TASK_INTERRUPTIBLE state when + * faults, and we cannot just set TASK_INTERRUPTIBLE state when * queueing ourselves into the futex hash. This code thus has to - * rely on the futex_wake() code doing a wakeup after removing - * the waiter from the list. + * rely on the futex_wake() code removing us from hash when it + * wakes us up. */ add_wait_queue(&q.waiters, &wait); - spin_lock(&futex_lock); + bh = hash_futex(&key); + spin_lock(&bh->lock); set_current_state(TASK_INTERRUPTIBLE); if (unlikely(list_empty(&q.list))) { /* * We were woken already. */ - spin_unlock(&futex_lock); + spin_unlock(&bh->lock); set_current_state(TASK_RUNNING); return 0; } - spin_unlock(&futex_lock); + spin_unlock(&bh->lock); time = schedule_timeout(time); set_current_state(TASK_RUNNING); @@ -394,26 +423,17 @@ static int futex_wait(unsigned long uaddr, int val, unsigned long time) * we are the only user of it. */ - /* - * Were we woken or interrupted for a valid reason? - */ - ret = unqueue_me(&q); - if (ret == 0) + /* If we were woken (and unqueued), we succeeded, whatever. */ + if (!unqueue_me(&q)) return 0; if (time == 0) return -ETIMEDOUT; - if (signal_pending(current)) - return -EINTR; - - /* - * No, it was a spurious wakeup. Try again. Should never happen. :) - */ - goto try_again; + /* A spurious wakeup should never happen. */ + WARN_ON(!signal_pending(current)); + return -EINTR; out_unqueue: - /* - * Were we unqueued anyway? - */ + /* If we were woken (and unqueued), we succeeded, whatever. */ if (!unqueue_me(&q)) ret = 0; out_release_sem: @@ -435,13 +455,14 @@ static unsigned int futex_poll(struct file *filp, struct poll_table_struct *wait) { struct futex_q *q = filp->private_data; + struct futex_hash_bucket *bh = hash_futex(&q->key); int ret = 0; poll_wait(filp, &q->waiters, wait); - spin_lock(&futex_lock); + spin_lock(&bh->lock); if (list_empty(&q->list)) ret = POLLIN | POLLRDNORM; - spin_unlock(&futex_lock); + spin_unlock(&bh->lock); return ret; } @@ -587,8 +608,10 @@ static int __init init(void) register_filesystem(&futex_fs_type); futex_mnt = kern_mount(&futex_fs_type); - for (i = 0; i < ARRAY_SIZE(futex_queues); i++) - INIT_LIST_HEAD(&futex_queues[i]); + for (i = 0; i < ARRAY_SIZE(futex_queues); i++) { + INIT_LIST_HEAD(&futex_queues[i].chain); + futex_queues[i].lock = SPIN_LOCK_UNLOCKED; + } return 0; } __initcall(init); diff --git a/kernel/resource.c b/kernel/resource.c index 58fdf2c88b32..f8ce88129fd2 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -38,75 +38,91 @@ static rwlock_t resource_lock = RW_LOCK_UNLOCKED; #ifdef CONFIG_PROC_FS -#define MAX_IORES_LEVEL 5 +enum { MAX_IORES_LEVEL = 5 }; -/* - * do_resource_list(): - * for reports of /proc/ioports and /proc/iomem; - * do current entry, then children, then siblings; - */ -static int do_resource_list(struct seq_file *m, struct resource *res, const char *fmt, int level) +static void *r_next(struct seq_file *m, void *v, loff_t *pos) { - while (res) { - const char *name; - - name = res->name ? res->name : "<BAD>"; - if (level > MAX_IORES_LEVEL) - level = MAX_IORES_LEVEL; - seq_printf (m, fmt + 2 * MAX_IORES_LEVEL - 2 * level, - res->start, res->end, name); - - if (res->child) - do_resource_list(m, res->child, fmt, level + 1); + struct resource *p = v; + (*pos)++; + if (p->child) + return p->child; + while (!p->sibling && p->parent) + p = p->parent; + return p->sibling; +} - res = res->sibling; - } +static void *r_start(struct seq_file *m, loff_t *pos) +{ + struct resource *p = m->private; + loff_t l = 0; + read_lock(&resource_lock); + for (p = p->child; p && l < *pos; p = r_next(m, p, &l)) + ; + return p; +} - return 0; +static void r_stop(struct seq_file *m, void *v) +{ + read_unlock(&resource_lock); } -static int ioresources_show(struct seq_file *m, void *v) +static int r_show(struct seq_file *m, void *v) { struct resource *root = m->private; - char *fmt; - int retval; + struct resource *r = v, *p; + int width = root->end < 0x10000 ? 4 : 8; + int depth; - fmt = root->end < 0x10000 - ? " %04lx-%04lx : %s\n" - : " %08lx-%08lx : %s\n"; - read_lock(&resource_lock); - retval = do_resource_list(m, root->child, fmt, 0); - read_unlock(&resource_lock); - return retval; + for (depth = 0, p = r; depth < MAX_IORES_LEVEL; depth++, p = p->parent) + if (p->parent == root) + break; + seq_printf(m, "%*s%0*lx-%0*lx : %s\n", + depth * 2, "", + width, r->start, + width, r->end, + r->name ? r->name : "<BAD>"); + return 0; } -static int ioresources_open(struct file *file, struct resource *root) +struct seq_operations resource_op = { + .start = r_start, + .next = r_next, + .stop = r_stop, + .show = r_show, +}; + +static int ioports_open(struct inode *inode, struct file *file) { - return single_open(file, ioresources_show, root); + int res = seq_open(file, &resource_op); + if (!res) { + struct seq_file *m = file->private_data; + m->private = &ioport_resource; + } + return res; } -static int ioports_open(struct inode *inode, struct file *file) +static int iomem_open(struct inode *inode, struct file *file) { - return ioresources_open(file, &ioport_resource); + int res = seq_open(file, &resource_op); + if (!res) { + struct seq_file *m = file->private_data; + m->private = &iomem_resource; + } + return res; } static struct file_operations proc_ioports_operations = { .open = ioports_open, .read = seq_read, .llseek = seq_lseek, - .release = single_release, + .release = seq_release, }; -static int iomem_open(struct inode *inode, struct file *file) -{ - return ioresources_open(file, &iomem_resource); -} - static struct file_operations proc_iomem_operations = { .open = iomem_open, .read = seq_read, .llseek = seq_lseek, - .release = single_release, + .release = seq_release, }; static int __init ioresources_init(void) diff --git a/mm/mmap.c b/mm/mmap.c index 61c9f5ca5f82..eae068ccdae1 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1269,6 +1269,9 @@ unsigned long do_brk(unsigned long addr, unsigned long len) if (!len) return addr; + if ((addr + len) > TASK_SIZE || (addr + len) < addr) + return -EINVAL; + /* * mlock MCL_FUTURE? */ diff --git a/net/Kconfig b/net/Kconfig index d6e91d248835..af14dbe43112 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -31,12 +31,9 @@ config PACKET protocol implemented in the kernel, e.g. tcpdump. If you want them to work, choose Y. - This driver is also available as a module called af_packet ( = - code which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>; if you use modprobe - or kmod, you may also want to add "alias net-pf-17 af_packet" to - /etc/modules.conf. + To compile this driver as a module, choose M here: the module will + be called af_packet. If you use modprobe or kmod, you may also + want to add "alias net-pf-17 af_packet" to /etc/modules.conf. If unsure, say Y. @@ -69,10 +66,7 @@ config UNIX an embedded system or something similar, you therefore definitely want to say Y here. - However, the socket support is also available as a module ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. The module will be + To compile this driver as a module, choose M here: the module will be called unix. If you try building this as a module and you have said Y to "Kernel module loader support" above, be sure to add 'alias net-pf-1 unix' to your /etc/modules.conf file. Note that @@ -140,10 +134,8 @@ config IPV6 given in <file:Documentation/Changes>. You will still be able to do regular IPv4 networking as well. - This protocol support is also available as a module ( = code which - can be inserted in and removed from the running kernel whenever you - want). The module will be called ipv6. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + To compile this protocol support as a module, choose M here: the + module will be called ipv6. It is safe to say N here for now. @@ -197,9 +189,7 @@ config BRIDGE Enabling arptables support when bridging will let arptables see bridged ARP traffic in the arptables FORWARD chain. - If you want to compile this code as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this code as a module, choose M here: the module will be called bridge. If unsure, say N. @@ -400,12 +390,10 @@ config IPX General information about how to connect Linux, Windows machines and Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>. - The IPX driver would enlarge your kernel by about 16 KB. This driver - is also available as a module ( = code which can be inserted in and - removed from the running kernel whenever you want). The module will - be called ipx. If you want to compile it as a module, say M here - and read <file:Documentation/modules.txt>. Unless you want to - integrate your Linux box with a local Novell network, say N. + The IPX driver would enlarge your kernel by about 16 KB. To compile + this driver as a module, choose M here: the module will be called ipx. + Unless you want to integrate your Linux box with a local Novell + network, say N. source "net/ipx/Kconfig" @@ -430,14 +418,11 @@ config ATALK <http://www.tldp.org/docs.html#howto>, contains valuable information as well. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module is called appletalk. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. You - almost certainly want to compile it as a module so you can restart - your AppleTalk stack without rebooting your machine. I hear that - the GNU boycott of Apple is over, so even politically correct people - are allowed to say Y here. + To compile this driver as a module, choose M here: the module will be + called appletalk. You almost certainly want to compile it as a + module so you can restart your AppleTalk stack without rebooting + your machine. I hear that the GNU boycott of Apple is over, so + even politically correct people are allowed to say Y here. source "drivers/net/appletalk/Kconfig" @@ -469,9 +454,7 @@ config X25 Ethernet card and the LAPB over Ethernet (say Y to "LAPB Data Link Driver" and "LAPB over Ethernet driver" below). - If you want to compile this driver as a module ( = code which can be - inserted in and removed from the running kernel whenever you want), - say M here and read <file:Documentation/modules.txt>. The module + To compile this driver as a module, choose M here: the module will be called x25. If unsure, say N. config LAPB @@ -490,9 +473,7 @@ config LAPB <file:Documentation/networking/lapb-module.txt> for technical details. - If you want to compile this driver as a module though ( = code which - can be inserted in and removed from the running kernel whenever you - want), say M here and read <file:Documentation/modules.txt>. The + To compile this driver as a module, choose M here: the module will be called lapb. If unsure, say N. config NET_DIVERT @@ -536,10 +517,8 @@ config ECONET to send Econet/AUN traffic over a UDP Ethernet connection or over a native Econet network card. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called econet. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the module + will be called econet. config ECONET_AUNUDP bool "AUN over UDP" @@ -577,10 +556,8 @@ config WAN_ROUTER Read <file:Documentation/networking/wan-router.txt> for more information. - The WAN routing support is also available as a module called - wanrouter ( = code which can be inserted in and removed from the - running kernel whenever you want). If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile WAN routing support as a module, choose M here: the + module will be called wanrouter. If unsure, say N. @@ -678,10 +655,8 @@ config NET_PKTGEN Documentation on how to use the packet generaor can be found at <file:Documentation/networking/pktgen.txt>. - This code is also available as a module called pktgen ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called pktgen. endmenu diff --git a/net/ax25/Kconfig b/net/ax25/Kconfig index d12b621ec51b..775174d175af 100644 --- a/net/ax25/Kconfig +++ b/net/ax25/Kconfig @@ -48,10 +48,8 @@ config AX25 general is on the WWW at <http://www.tapr.org/tapr/html/pkthome.html>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called ax25. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called ax25. config AX25_DAMA_SLAVE bool "AX.25 DAMA Slave support" @@ -81,10 +79,8 @@ config NETROM information about digital amateur radio in general is on the WWW at <http://www.tapr.org/tapr/html/pkthome.html>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called netrom. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called netrom. config ROSE tristate "Amateur Radio X.25 PLP (Rose)" @@ -102,10 +98,8 @@ config ROSE information about digital amateur radio in general is on the WWW at <http://www.tapr.org/tapr/html/pkthome.html>. - This driver is also available as a module ( = code which can be - inserted in and removed from the running kernel whenever you want). - The module will be called rose. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + To compile this driver as a module, choose M here: the + module will be called rose. menu "AX.25 network device drivers" diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig index 5108233fd2bb..34e535ca157c 100644 --- a/net/bridge/netfilter/Kconfig +++ b/net/bridge/netfilter/Kconfig @@ -23,8 +23,7 @@ config BRIDGE_EBT_BROUTE brouter. See the man page for ebtables(8) and examples on the ebtables website. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_T_FILTER tristate "ebt: filter table support" @@ -34,8 +33,7 @@ config BRIDGE_EBT_T_FILTER local input, forwarding and local output. See the man page for ebtables(8). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_T_NAT tristate "ebt: nat table support" @@ -45,8 +43,7 @@ config BRIDGE_EBT_T_NAT source address (MAC SNAT) or the MAC destination address (MAC DNAT). See the man page for ebtables(8). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # # matches # @@ -56,8 +53,7 @@ config BRIDGE_EBT_802_3 help This option adds matching support for 802.3 Ethernet frames. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_ARP tristate "ebt: ARP filter support" @@ -66,8 +62,7 @@ config BRIDGE_EBT_ARP This option adds the ARP match, which allows ARP and RARP header field filtering. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_IP tristate "ebt: IP filter support" @@ -76,8 +71,7 @@ config BRIDGE_EBT_IP This option adds the IP match, which allows basic IP header field filtering. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_MARK tristate "ebt: mark filter support" @@ -88,8 +82,7 @@ config BRIDGE_EBT_MARK This value is the same as the one used in the iptables mark match and target. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_PKTTYPE tristate "ebt: packet type filter support" @@ -100,8 +93,7 @@ config BRIDGE_EBT_PKTTYPE the generic networking code): broadcast, multicast, for this host alone or for another host. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_STP tristate "ebt: STP filter support" @@ -110,8 +102,7 @@ config BRIDGE_EBT_STP This option adds the Spanning Tree Protocol match, which allows STP header field filtering. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_VLAN tristate "ebt: 802.1Q VLAN filter support" @@ -120,8 +111,7 @@ config BRIDGE_EBT_VLAN This option adds the 802.1Q vlan match, which allows the filtering of 802.1Q vlan fields. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # # targets # @@ -132,8 +122,7 @@ config BRIDGE_EBT_ARPREPLY This option adds the arp reply target, which allows automatically sending arp replies to arp requests. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_DNAT tristate "ebt: dnat target support" @@ -142,8 +131,7 @@ config BRIDGE_EBT_DNAT This option adds the MAC DNAT target, which allows altering the MAC destination address of frames. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_MARK_T tristate "ebt: mark target support" @@ -154,8 +142,7 @@ config BRIDGE_EBT_MARK_T This value is the same as the one used in the iptables mark match and target. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_REDIRECT tristate "ebt: redirect target support" @@ -164,8 +151,7 @@ config BRIDGE_EBT_REDIRECT This option adds the MAC redirect target, which allows altering the MAC destination address of a frame to that of the device it arrived on. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config BRIDGE_EBT_SNAT tristate "ebt: snat target support" @@ -174,8 +160,7 @@ config BRIDGE_EBT_SNAT This option adds the MAC SNAT target, which allows altering the MAC source address of frames. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # # watchers # @@ -186,7 +171,6 @@ config BRIDGE_EBT_LOG This option adds the log target, that you can use in any rule in any ebtables table. It records the frame header to the syslog. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. endmenu diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig index 49189f15a4d4..13b39ae7b989 100644 --- a/net/ipv4/ipvs/Kconfig +++ b/net/ipv4/ipvs/Kconfig @@ -23,9 +23,8 @@ config IP_VS following URL: http://www.linuxvirtualserver.org/ - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_DEBUG bool "IP virtual server debugging" @@ -103,9 +102,8 @@ config IP_VS_RR The robin-robin scheduling algorithm simply directs network connections to different real servers in a round-robin manner. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_WRR tristate "weighted round-robin scheduling" @@ -118,9 +116,8 @@ config IP_VS_WRR with higher weights get more connections than those with less weights and servers with equal weights get equal connections. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_LC tristate "least-connection scheduling scheduling" @@ -130,9 +127,8 @@ config IP_VS_LC connections to the server with the least number of active connections. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_WLC tristate "weighted least-connection scheduling" @@ -142,9 +138,8 @@ config IP_VS_WLC connections to the server with the least active connections normalized by the server weight. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_LBLC tristate "locality-based least-connection scheduling" @@ -158,9 +153,8 @@ config IP_VS_LBLC and there is a server in its half load, then allocate the weighted least-connection server to this IP address. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_LBLCR tristate "locality-based least-connection with replication scheduling" @@ -178,9 +172,8 @@ config IP_VS_LBLCR modified for the specified time, the most loaded node is removed from the server set, in order to avoid high degree of replication. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_DH tristate "destination hashing scheduling" @@ -190,9 +183,8 @@ config IP_VS_DH connections to the servers through looking up a statically assigned hash table by their destination IP addresses. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_SH tristate "source hashing scheduling" @@ -202,9 +194,8 @@ config IP_VS_SH connections to the servers through looking up a statically assigned hash table by their source IP addresses. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_SED tristate "shortest expected delay scheduling" @@ -217,9 +208,8 @@ config IP_VS_SED on the the ith server and Ui is the fixed service rate (weight) of the ith server. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. config IP_VS_NQ tristate "never queue scheduling" @@ -232,9 +222,8 @@ config IP_VS_NQ that minimize its expected delay (The Shortest Expected Delay scheduling algorithm). - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. comment 'IPVS application helper' depends on IP_VS @@ -250,8 +239,7 @@ config IP_VS_FTP required for tracking the connection and mangling it back to that of virtual service. - If you want to compile it in kernel, say Y. If you want to compile - it as a module, say M here and read Documentation/modules.txt. If - unsure, say N. + If you want to compile it in kernel, say Y. To compile it as a + module, choose M here. If unsure, say N. endmenu diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index ba39c9216288..1ea8932694e1 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -17,8 +17,7 @@ config IP_NF_CONNTRACK enhance packet filtering (see `Connection state match support' below). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_FTP tristate "FTP protocol support" @@ -28,8 +27,7 @@ config IP_NF_FTP required for tracking them, and doing masquerading and other forms of Network Address Translation on them. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `Y'. + To compile it as a module, choose M here. If unsure, say Y. config IP_NF_IRC tristate "IRC protocol support" @@ -44,8 +42,7 @@ config IP_NF_IRC chats. Note that you do NOT need this extension to get files or have others initiate chats, or everything else in IRC. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `Y'. + To compile it as a module, choose M here. If unsure, say Y. config IP_NF_TFTP tristate "TFTP protocol support" @@ -56,8 +53,7 @@ config IP_NF_TFTP If you are using a tftp client behind -j SNAT or -j MASQUERADING you will need this. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `Y'. + To compile it as a module, choose M here. If unsure, say Y. config IP_NF_AMANDA tristate "Amanda backup protocol support" @@ -70,8 +66,7 @@ config IP_NF_AMANDA Amanda requires for communication of the backup data, messages and index. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `Y'. + To compile it as a module, choose M here. If unsure, say Y. config IP_NF_QUEUE tristate "Userspace queueing via NETLINK" @@ -79,8 +74,7 @@ config IP_NF_QUEUE Netfilter has the ability to queue packets to user space: the netlink device can be used to access them using this driver. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_IPTABLES tristate "IP tables support (required for filtering/masq/NAT)" @@ -90,8 +84,7 @@ config IP_NF_IPTABLES etc) subsystems now use this: say `Y' or `M' here if you want to use either of those. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # The simple matches. config IP_NF_MATCH_LIMIT @@ -102,8 +95,7 @@ config IP_NF_MATCH_LIMIT matched: mainly useful in combination with the LOG target ("LOG target support", below) and to avoid some Denial of Service attacks. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_IPRANGE tristate "IP range match support" @@ -112,8 +104,7 @@ config IP_NF_MATCH_IPRANGE This option makes possible to match IP addresses against IP address ranges. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_MAC tristate "MAC address match support" @@ -122,8 +113,7 @@ config IP_NF_MATCH_MAC MAC matching allows you to match packets based on the source Ethernet address of the packet. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_PKTTYPE tristate "Packet type match support" @@ -135,8 +125,7 @@ config IP_NF_MATCH_PKTTYPE Typical usage: iptables -A INPUT -m pkttype --pkt-type broadcast -j LOG - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_MARK tristate "netfilter MARK match support" @@ -146,8 +135,7 @@ config IP_NF_MATCH_MARK `nfmark' value in the packet. This can be set by the MARK target (see below). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_MULTIPORT tristate "Multiple port match support" @@ -157,8 +145,7 @@ config IP_NF_MATCH_MULTIPORT a series of source or destination ports: normally a rule can only match a single range of ports. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_TOS tristate "TOS match support" @@ -167,8 +154,7 @@ config IP_NF_MATCH_TOS TOS matching allows you to match packets based on the Type Of Service fields of the IP packet. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_RECENT tristate "recent match support" @@ -180,8 +166,7 @@ config IP_NF_MATCH_RECENT Short options are available by using 'iptables -m recent -h' Official Website: <http://snowman.net/projects/ipt_recent/> - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_ECN tristate "ECN match support" @@ -190,8 +175,7 @@ config IP_NF_MATCH_ECN This option adds a `ECN' match, which allows you to match against the IPv4 and TCP header ECN fields. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_DSCP tristate "DSCP match support" @@ -202,8 +186,7 @@ config IP_NF_MATCH_DSCP The DSCP codepoint can have any value between 0x0 and 0x4f. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_AH_ESP tristate "AH/ESP match support" @@ -212,8 +195,7 @@ config IP_NF_MATCH_AH_ESP These two match extensions (`ah' and `esp') allow you to match a range of SPIs inside AH or ESP headers of IPSec packets. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_LENGTH tristate "LENGTH match support" @@ -222,8 +204,7 @@ config IP_NF_MATCH_LENGTH This option allows you to match the length of a packet against a specific value or range of values. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_TTL tristate "TTL match support" @@ -232,8 +213,7 @@ config IP_NF_MATCH_TTL This adds CONFIG_IP_NF_MATCH_TTL option, which enabled the user to match packets by their TTL value. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_TCPMSS tristate "tcpmss match support" @@ -243,8 +223,7 @@ config IP_NF_MATCH_TCPMSS MSS value of TCP SYN packets, which control the maximum packet size for that connection. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_HELPER tristate "Helper match support" @@ -253,8 +232,7 @@ config IP_NF_MATCH_HELPER Helper matching allows you to match packets in dynamic connections tracked by a conntrack-helper, ie. ip_conntrack_ftp - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `Y'. + To compile it as a module, choose M here. If unsure, say Y. config IP_NF_MATCH_STATE tristate "Connection state match support" @@ -264,8 +242,7 @@ config IP_NF_MATCH_STATE relationship to a tracked connection (ie. previous packets). This is a powerful tool for packet classification. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_CONNTRACK tristate "Connection tracking match support" @@ -277,8 +254,7 @@ config IP_NF_MATCH_CONNTRACK useful in complex configurations, such as NAT gateways with multiple internet links or tunnels. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_OWNER tristate "Owner match support" @@ -287,8 +263,7 @@ config IP_NF_MATCH_OWNER Packet owner matching allows you to match locally-generated packets based on who created them: the user, group, process or session. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_MATCH_PHYSDEV tristate "Physdev match support" @@ -297,8 +272,7 @@ config IP_NF_MATCH_PHYSDEV Physdev packet matching matches against the physical bridge ports the IP packet arrived on or will leave by. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # The targets config IP_NF_FILTER @@ -309,8 +283,7 @@ config IP_NF_FILTER rules for simple packet filtering at local input, forwarding and local output. See the man page for iptables(8). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_REJECT tristate "REJECT target support" @@ -320,8 +293,7 @@ config IP_NF_TARGET_REJECT error should be issued in response to an incoming packet, rather than silently being dropped. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_NAT tristate "Full NAT" @@ -331,8 +303,7 @@ config IP_NF_NAT forms of full Network Address Port Translation. It is controlled by the `nat' table in iptables: see the man page for iptables(8). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_NAT_NEEDED bool @@ -349,8 +320,7 @@ config IP_NF_TARGET_MASQUERADE only useful for dialup accounts with dynamic IP address (ie. your IP address will be different on next dialup). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_REDIRECT tristate "REDIRECT target support" @@ -361,8 +331,7 @@ config IP_NF_TARGET_REDIRECT come to the local machine instead of passing through. This is useful for transparent proxies. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_NETMAP tristate "NETMAP target support" @@ -373,8 +342,7 @@ config IP_NF_TARGET_NETMAP address part intact. It is similar to Fast NAT, except that Netfilter's connection tracking doesn't work well with Fast NAT. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_SAME tristate "SAME target support" @@ -383,8 +351,7 @@ config IP_NF_TARGET_SAME This option adds a `SAME' target, which works like the standard SNAT target, but attempts to give clients the same IP for all connections. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_NAT_LOCAL bool "NAT of local connections (READ HELP)" @@ -413,8 +380,7 @@ config IP_NF_NAT_SNMP_BASIC This is the "basic" form of SNMP-ALG, as described in RFC 2962 - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_NAT_IRC tristate @@ -450,8 +416,7 @@ config IP_NF_MANGLE iptables(8). This table is used for various packet alterations which can effect how the packet is routed. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_TOS tristate "TOS target support" @@ -461,8 +426,7 @@ config IP_NF_TARGET_TOS the `mangle' table which alter the Type Of Service field of an IP packet prior to routing. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_ECN tristate "ECN target support" @@ -476,8 +440,7 @@ config IP_NF_TARGET_ECN existing ECN blackholes on the internet, but don't want to disable ECN support in general. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_DSCP tristate "DSCP target support" @@ -488,8 +451,7 @@ config IP_NF_TARGET_DSCP The DSCP codepoint can have any value between 0x0 and 0x4f. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_MARK tristate "MARK target support" @@ -502,8 +464,7 @@ config IP_NF_TARGET_MARK key') and can also be used by other subsystems to change their behavior. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_CLASSIFY tristate "CLASSIFY target support" @@ -515,8 +476,7 @@ config IP_NF_TARGET_CLASSIFY atm, cbq, dsmark, pfifo_fast, htb, prio - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_LOG tristate "LOG target support" @@ -525,8 +485,7 @@ config IP_NF_TARGET_LOG This option adds a `LOG' target, which allows you to create rules in any iptables table which records the packet header to the syslog. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_ULOG tristate "ULOG target support" @@ -540,8 +499,7 @@ config IP_NF_TARGET_ULOG The apropriate userspace logging daemon (ulogd) may be obtained from http://www.gnumonks.org/projects/ulogd - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_TARGET_TCPMSS tristate "TCPMSS target support" @@ -567,8 +525,7 @@ config IP_NF_TARGET_TCPMSS iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN \ -j TCPMSS --clamp-mss-to-pmtu - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_ARPTABLES tristate "ARP tables support" @@ -595,8 +552,7 @@ config IP_NF_COMPAT_IPCHAINS `Packet filtering'). With this enabled, you should be able to use the ipchains tool exactly as in 2.2 kernels. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP_NF_COMPAT_IPFWADM tristate "ipfwadm (2.0-style) support" @@ -608,8 +564,7 @@ config IP_NF_COMPAT_IPFWADM `Packet filtering'). With this enabled, you should be able to use the ipfwadm tool exactly as in 2.0 kernels. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. endmenu diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index e37827ac6513..95181d5577b3 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -24,8 +24,7 @@ config IP6_NF_QUEUE Universidad Politecnica de Alcala de Henares email: fanton@it.uc3m.es - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_IPTABLES tristate "IP6 tables support (required for filtering/masq/NAT)" @@ -35,8 +34,7 @@ config IP6_NF_IPTABLES for IPv6 use this, but connection tracking is going to follow. Say 'Y' or 'M' here if you want to use either of those. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # The simple matches. config IP6_NF_MATCH_LIMIT @@ -47,8 +45,7 @@ config IP6_NF_MATCH_LIMIT matched: mainly useful in combination with the LOG target ("LOG target support", below) and to avoid some Denial of Service attacks. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_MAC tristate "MAC address match support" @@ -57,8 +54,7 @@ config IP6_NF_MATCH_MAC mac matching allows you to match packets based on the source Ethernet address of the packet. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_RT tristate "Routing header match support" @@ -67,8 +63,7 @@ config IP6_NF_MATCH_RT rt matching allows you to match packets based on the routing header of the packet. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_OPTS tristate "Hop-by-hop and Dst opts header match support" @@ -77,8 +72,7 @@ config IP6_NF_MATCH_OPTS This allows one to match packets based on the hop-by-hop and destination options headers of a packet. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_FRAG tristate "Fragmentation header match support" @@ -87,8 +81,7 @@ config IP6_NF_MATCH_FRAG frag matching allows you to match packets based on the fragmentation header of the packet. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_HL tristate "HL match support" @@ -97,8 +90,7 @@ config IP6_NF_MATCH_HL HL matching allows you to match packets based on the hop limit of the packet. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_MULTIPORT tristate "Multiple port match support" @@ -108,8 +100,7 @@ config IP6_NF_MATCH_MULTIPORT a series of source or destination ports: normally a rule can only match a single range of ports. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_OWNER tristate "Owner match support" @@ -118,8 +109,7 @@ config IP6_NF_MATCH_OWNER Packet owner matching allows you to match locally-generated packets based on who created them: the user, group, process or session. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # dep_tristate ' MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES config IP6_NF_MATCH_MARK @@ -130,8 +120,7 @@ config IP6_NF_MATCH_MARK `nfmark' value in the packet. This can be set by the MARK target (see below). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_IPV6HEADER tristate "IPv6 Extension Headers Match" @@ -140,8 +129,7 @@ config IP6_NF_MATCH_IPV6HEADER This module allows one to match packets based upon the ipv6 extension headers. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_AHESP tristate "AH/ESP match support" @@ -149,8 +137,7 @@ config IP6_NF_MATCH_AHESP help This module allows one to match AH and ESP packets. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_LENGTH tristate "Packet Length match support" @@ -159,8 +146,7 @@ config IP6_NF_MATCH_LENGTH This option allows you to match the length of a packet against a specific value or range of values. - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_MATCH_EUI64 tristate "EUI64 address check" @@ -170,8 +156,7 @@ config IP6_NF_MATCH_EUI64 Compares the last 64 bits with the EUI64 (delivered from the MAC address) address - If you want to compile it as a module, say M here and read - Documentation/modules.txt. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # dep_tristate ' Multiple port match support' CONFIG_IP6_NF_MATCH_MULTIPORT $CONFIG_IP6_NF_IPTABLES # dep_tristate ' TOS match support' CONFIG_IP6_NF_MATCH_TOS $CONFIG_IP6_NF_IPTABLES @@ -191,8 +176,7 @@ config IP6_NF_FILTER rules for simple packet filtering at local input, forwarding and local output. See the man page for iptables(8). - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. config IP6_NF_TARGET_LOG tristate "LOG target support" @@ -201,8 +185,7 @@ config IP6_NF_TARGET_LOG This option adds a `LOG' target, which allows you to create rules in any iptables table which records the packet header to the syslog. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # if [ "$CONFIG_IP6_NF_FILTER" != "n" ]; then # dep_tristate ' REJECT target support' CONFIG_IP6_NF_TARGET_REJECT $CONFIG_IP6_NF_FILTER @@ -218,8 +201,7 @@ config IP6_NF_MANGLE iptables(8). This table is used for various packet alterations which can effect how the packet is routed. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. # dep_tristate ' TOS target support' CONFIG_IP6_NF_TARGET_TOS $CONFIG_IP_NF_MANGLE config IP6_NF_TARGET_MARK @@ -233,8 +215,7 @@ config IP6_NF_TARGET_MARK key') and can also be used by other subsystems to change their behavior. - If you want to compile it as a module, say M here and read - <file:Documentation/modules.txt>. If unsure, say `N'. + To compile it as a module, choose M here. If unsure, say N. #dep_tristate ' LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_IPTABLES endmenu diff --git a/net/irda/irlan/Kconfig b/net/irda/irlan/Kconfig index 9222323adca9..951abc2e3a7f 100644 --- a/net/irda/irlan/Kconfig +++ b/net/irda/irlan/Kconfig @@ -2,10 +2,10 @@ config IRLAN tristate "IrLAN protocol" depends on IRDA help - Say Y here if you want to build support for the IrLAN protocol. If - you want to compile it as a module (irlan), say M here and read - <file:Documentation/modules.txt>. IrLAN emulates an Ethernet and - makes it possible to put up a wireless LAN using infrared beams. + Say Y here if you want to build support for the IrLAN protocol. + To compile it as a module, choose M here: the module will be called + irlan. IrLAN emulates an Ethernet and makes it possible to put up + a wireless LAN using infrared beams. The IrLAN protocol can be used to talk with infrared access points like the HP NetbeamIR, or the ESI JetEye NET. You can also connect diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 7e868f1c6a38..f2eeaadb3eb1 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -21,10 +21,8 @@ config NET_SCH_CBQ is a routine that allows you to sort your outgoing traffic into classes based on a certain criterion. - This code is also available as a module called sch_cbq ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_cbq. config NET_SCH_HTB tristate "HTB packet scheduler" @@ -38,10 +36,8 @@ config NET_SCH_HTB HTB is very similar to the CBQ regarding its goals however is has different properties and different algorithm. - This code is also available as a module called sch_htb ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_htb. config NET_SCH_CSZ tristate "CSZ packet scheduler" @@ -55,10 +51,8 @@ config NET_SCH_CSZ Note: this scheduler is currently broken. - This code is also available as a module called sch_csz ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_csz. #tristate ' H-PFQ packet scheduler' CONFIG_NET_SCH_HPFQ #tristate ' H-FSC packet scheduler' CONFIG_NET_SCH_HFCS @@ -72,10 +66,8 @@ config NET_SCH_ATM the flow(s) it is handling to a given virtual circuit (see the top of <file:net/sched/sch_atm.c>). - This code is also available as a module called sch_atm ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_atm. config NET_SCH_PRIO tristate "The simplest PRIO pseudoscheduler" @@ -85,10 +77,8 @@ config NET_SCH_PRIO "scheduler" for some of your network devices or as a leaf discipline for the CBQ scheduling algorithm. If unsure, say Y. - This code is also available as a module called sch_prio ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_prio. config NET_SCH_RED tristate "RED queue" @@ -99,10 +89,8 @@ config NET_SCH_RED the top of <file:net/sched/sch_red.c> for details and references about the algorithm). - This code is also available as a module called sch_red ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_red. config NET_SCH_SFQ tristate "SFQ queue" @@ -114,10 +102,8 @@ config NET_SCH_SFQ <file:net/sched/sch_sfq.c> for details and references about the SFQ algorithm). - This code is also available as a module called sch_sfq ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_sfq. config NET_SCH_TEQL tristate "TEQL queue" @@ -130,10 +116,8 @@ config NET_SCH_TEQL one virtual device. (see the top of <file:net/sched/sch_teql.c> for details). - This code is also available as a module called sch_teql ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_teql. config NET_SCH_TBF tristate "TBF queue" @@ -144,10 +128,8 @@ config NET_SCH_TBF leaf discipline for the CBQ scheduling algorithm (see the top of <file:net/sched/sch_tbf.c> for a description of the TBF algorithm). - This code is also available as a module called sch_tbf ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_tbf. config NET_SCH_GRED tristate "GRED queue" @@ -158,10 +140,8 @@ config NET_SCH_GRED (see the top of <file:net/sched/sch_red.c> for details and references about the algorithm). - This code is also available as a module called sch_gred ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_gred. config NET_SCH_DSMARK tristate "Diffserv field marker" @@ -172,10 +152,8 @@ config NET_SCH_DSMARK Technical information on this method, with pointers to associated RFCs, is available at <http://www.gta.ufrj.br/diffserv/>. - This code is also available as a module called sch_dsmark ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called sch_dsmark. config NET_SCH_INGRESS tristate "Ingress Qdisc" @@ -185,10 +163,8 @@ config NET_SCH_INGRESS and drop packets when this bandwidth exceeds your desired rate. If unsure, say Y. - This code is also available as a module called cls_ingress - ( = code which can be inserted in and removed from the running - kernel whenever you want). If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called cls_ingress. config NET_QOS bool "QoS support" @@ -240,10 +216,8 @@ config NET_CLS_TCINDEX feature if you want to implement Differentiated Services using sch_dsmark. If unsure, say Y. - This code is also available as a module called cls_tcindex - ( = code which can be inserted in and removed from the running - kernel whenever you want). If you want to compile it as a module, - say M here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called cls_tcindex. config NET_CLS_ROUTE4 tristate "Routing table based classifier" @@ -252,10 +226,8 @@ config NET_CLS_ROUTE4 If you say Y here, you will be able to classify outgoing packets according to the route table entry they matched. If unsure, say Y. - This code is also available as a module called cls_route ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called cls_route. config NET_CLS_ROUTE bool @@ -269,10 +241,8 @@ config NET_CLS_FW If you say Y here, you will be able to classify outgoing packets according to firewall criteria you specified. - This code is also available as a module called cls_fw ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called cls_fw. config NET_CLS_U32 tristate "U32 classifier" @@ -281,10 +251,8 @@ config NET_CLS_U32 If you say Y here, you will be able to classify outgoing packets according to their destination address. If unsure, say Y. - This code is also available as a module called cls_u32 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called cls_u32. config NET_CLS_RSVP tristate "Special RSVP classifier" @@ -297,10 +265,8 @@ config NET_CLS_RSVP Say Y here if you want to be able to classify outgoing packets based on their RSVP requests. - This code is also available as a module called cls_rsvp ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called cls_rsvp. config NET_CLS_RSVP6 tristate "Special RSVP classifier for IPv6" @@ -314,10 +280,8 @@ config NET_CLS_RSVP6 on their RSVP requests and you are using the new Internet Protocol IPv6 as opposed to the older and more common IPv4. - This code is also available as a module called cls_rsvp6 ( = code - which can be inserted in and removed from the running kernel - whenever you want). If you want to compile it as a module, say M - here and read <file:Documentation/modules.txt>. + To compile this code as a module, choose M here: the + module will be called cls_rsvp6. config NET_CLS_POLICE bool "Traffic policing (needed for in/egress)" |