From f6a7ecb0ab17b82477ddf1f33349a1890ed65732 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sat, 4 Oct 2003 21:31:50 -0700 Subject: [PATCH] [PATCH] More modules.txt removals From: Nicolas Kaiser --- Documentation/cdrom/aztcd | 3 +-- Documentation/cdrom/sbpcd | 1 - Documentation/ftape.txt | 3 +-- Documentation/kbuild/makefiles.txt | 1 - Documentation/sound/oss/Introduction | 3 +-- Documentation/video4linux/CQcam.txt | 3 +-- README | 2 -- drivers/atm/Kconfig | 27 ++++++++++----------------- drivers/md/Kconfig | 26 ++++++++------------------ fs/hfs/INSTALL.txt | 4 +--- net/irda/Kconfig | 5 ++--- net/irda/ircomm/Kconfig | 9 ++++----- net/irda/irnet/Kconfig | 9 ++++----- net/sctp/Kconfig | 6 ++---- sound/Kconfig | 10 ++++------ sound/oss/Kconfig | 6 ++---- 16 files changed, 41 insertions(+), 77 deletions(-) diff --git a/Documentation/cdrom/aztcd b/Documentation/cdrom/aztcd index 7f9f4d31d4050..cdf46687d2f81 100644 --- a/Documentation/cdrom/aztcd +++ b/Documentation/cdrom/aztcd @@ -178,8 +178,7 @@ If you do not have the iso9660-filesystem in your boot kernel, you also have to load it before you can mount the CDROM: insmod /lib/modules/X.X.X/fs/isofs.o The mount procedure works as described in 4. above. -(In all commands 'X.X.X' is the current linux kernel version number. For details -see file modules.txt in /usr/src/linux/Documentation) +(In all commands 'X.X.X' is the current linux kernel version number) 4.2 CDROM CONNECTED TO A SOUNDCARD Most soundcards do have a bus interface to the CDROM-drive. In many cases diff --git a/Documentation/cdrom/sbpcd b/Documentation/cdrom/sbpcd index c99ae51e78b31..d1825dffca34e 100644 --- a/Documentation/cdrom/sbpcd +++ b/Documentation/cdrom/sbpcd @@ -272,7 +272,6 @@ Using sbpcd as a "loadable module": If you do NOT select "Matsushita/Panasonic CDROM driver support" during the "make config" of your kernel, you can build the "loadable module" sbpcd.o. -Read /usr/src/linux/Documentation/modules.txt on this. If sbpcd gets used as a module, the support of more than one interface card (i.e. drives 4...15) is disabled. diff --git a/Documentation/ftape.txt b/Documentation/ftape.txt index 525df9f892fca..bff9d0fe4718d 100644 --- a/Documentation/ftape.txt +++ b/Documentation/ftape.txt @@ -246,8 +246,7 @@ C. Boot and load time configuration or by editing the file `/etc/modules.conf' in which case they take effect each time when the module is loaded with `modprobe' (please - refer to the modules documentation, i.e. `modules.txt' and the - respective manual pages). Thus, you should add a line + refer to the respective manual pages). Thus, you should add a line options ftape ft_tracing=4 diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index e0a590afead2a..d43aabf336d75 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -212,7 +212,6 @@ more details, with real examples. No special notation is required in the makefiles for modules exporting symbols. - See also Documentation/modules.txt. --- 3.5 Library file goals - lib-y diff --git a/Documentation/sound/oss/Introduction b/Documentation/sound/oss/Introduction index d6d5f33dc114c..3e649dc173c4b 100644 --- a/Documentation/sound/oss/Introduction +++ b/Documentation/sound/oss/Introduction @@ -431,8 +431,7 @@ options bttv card=0 radio=0 pll=0 For More Information (RTFM): ============================ -1) Information on kernel modules: linux/Documentation/modules.txt - and manual pages for insmod and modprobe. +1) Information on kernel modules: manual pages for insmod and modprobe. 2) Information on PnP, RTFM manual pages for isapnp. diff --git a/Documentation/video4linux/CQcam.txt b/Documentation/video4linux/CQcam.txt index 3c5d25da80f72..3eba060f49b79 100644 --- a/Documentation/video4linux/CQcam.txt +++ b/Documentation/video4linux/CQcam.txt @@ -71,8 +71,7 @@ these procedures. 2.1 Module Configuration Using modules requires a bit of work to install and pass the -parameters. Do read ../modules.txt, and understand that entries -in /etc/modules.conf of: +parameters. Understand that entries in /etc/modules.conf of: alias parport_lowlevel parport_pc options parport_pc io=0x378 irq=none diff --git a/README b/README index 1cca70825efde..e369bb98bb92e 100644 --- a/README +++ b/README @@ -190,8 +190,6 @@ COMPILING the kernel: - If you configured any of the parts of the kernel as `modules', you will have to do "make modules" followed by "make modules_install". - Read Documentation/modules.txt for more information. For example, - an explanation of how to use the modules is included there. - Keep a backup kernel handy in case something goes wrong. This is especially true for the development releases, since each new release diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig index e7a7640623eab..fecdfe92cdfec 100644 --- a/drivers/atm/Kconfig +++ b/drivers/atm/Kconfig @@ -32,9 +32,8 @@ config ATM_ENI The driver works with MMF (-MF or ...F) and UTP-5 (-U5 or ...D) adapters. - This driver is also available as a module. If you want to compile - it as a module, say M here and read - . The module will be called eni. + To compile this driver as a module, choose M here: the module will + be called eni. config ATM_ENI_DEBUG bool "Enable extended debugging" @@ -138,10 +137,8 @@ config ATM_FIRESTREAM Driver for the Fujitsu FireStream 155 (MB86697) and FireStream 50 (MB86695) ATM PCI chips. - This driver is also available as a module. If you want to compile - it as a module, say M here and read - . The module will be called - firestream. + To compile this driver as a module, choose M here: the module will + be called firestream. config ATM_ZATM tristate "ZeitNet ZN1221/ZN1225" @@ -150,9 +147,8 @@ config ATM_ZATM Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM adapters. - This driver is also available as a module. If you want to compile - it as a module, say M here and read - . The module will be called zatm. + To compile this driver as a module, choose M here: the module will + be called zatm. config ATM_ZATM_DEBUG bool "Enable extended debugging" @@ -176,10 +172,8 @@ config ATM_NICSTAR 25 and for 155 Mbps, including IDT cards and the Fore ForeRunnerLE series. Say Y if you have one of those. - This driver is also available as a module. If you want to compile - it as a module, say M here and read - . The module will be called - nicstar. + To compile this driver as a module, choose M here: the module will + be called nicstar. config ATM_NICSTAR_USE_SUNI bool "Use suni PHY driver (155Mbps)" @@ -209,9 +203,8 @@ config ATM_IDT77252 help Driver for the IDT 77252 ATM PCI chips. - This driver is also available as a module. If you want to compile - it as a module, say M here and read - . The module will be called idt77252 + To compile this driver as a module, choose M here: the module will + be called idt77252. config ATM_IDT77252_DEBUG bool "Enable debugging messages" diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index afcd1a4549f08..1a8db01fb2d21 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -38,9 +38,7 @@ config MD_LINEAR use the so-called linear mode, i.e. it will combine the hard disk partitions by simply appending one to the other. - 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 . The module + To compile this as a module, choose M here: the module will be called linear. If unsure, say Y. @@ -60,9 +58,7 @@ config MD_RAID0 . There you will also learn where to get the supporting user space utilities raidtools. - 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 . The module + To compile this as a module, choose M here: the module will be called raid0. If unsure, say Y. @@ -84,11 +80,8 @@ config MD_RAID1 . There you will also learn where to get the supporting user space utilities raidtools. - If you want to use such a RAID-1 set, say Y. This code is also - available as a module called raid1 ( = 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 - . + If you want to use such a RAID-1 set, say Y. To compile this code + as a module, choose M here: the module will be called raid1. If unsure, say Y. @@ -109,11 +102,8 @@ config MD_RAID5 . There you will also learn where to get the supporting user space utilities raidtools. - If you want to use such a RAID-4/RAID-5 set, say Y. This code is - also available as a module called raid5 ( = 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 - . + If you want to use such a RAID-4/RAID-5 set, say Y. To compile + this code as a module, choose M here: the module will be called raid5. If unsure, say Y. @@ -140,8 +130,8 @@ config BLK_DEV_DM Higher level volume managers such as LVM2 use this driver. - If you want to compile this as a module, say M here and read - . The module will be called dm-mod. + To compile this as a module, choose M here: the module will be + called dm-mod. If unsure, say N. diff --git a/fs/hfs/INSTALL.txt b/fs/hfs/INSTALL.txt index 8ea44c0ec7a9f..b9c8efed4535b 100644 --- a/fs/hfs/INSTALL.txt +++ b/fs/hfs/INSTALL.txt @@ -15,9 +15,7 @@ +o The kernel sources (or at least the header files) available online. +o The module utilities package current for your kernel version and an - understanding of how to use it. (The file - Documentation/modules.txt in the kernel source directory provides a - brief introduction.) + understanding of how to use it. 22.. IInnssttaallllaattiioonn diff --git a/net/irda/Kconfig b/net/irda/Kconfig index 9ddf4e256a56c..be481ab5847e5 100644 --- a/net/irda/Kconfig +++ b/net/irda/Kconfig @@ -22,9 +22,8 @@ config IRDA will need to install some OBEX application, such as OpenObex : - This support is also available as a module called irda. If you - want to compile it as a module, say M here and read - . + To compile this support as a module, choose M here: the module will + be called irda. comment "IrDA protocols" depends on IRDA diff --git a/net/irda/ircomm/Kconfig b/net/irda/ircomm/Kconfig index 5735ef6808230..2d4c6b4a78d6c 100644 --- a/net/irda/ircomm/Kconfig +++ b/net/irda/ircomm/Kconfig @@ -2,12 +2,11 @@ config IRCOMM tristate "IrCOMM protocol" depends on IRDA help - Say Y here if you want to build support for the IrCOMM protocol. If - you want to compile it as a module (you will get ircomm and - ircomm-tty), say M here and read . + Say Y here if you want to build support for the IrCOMM protocol. + To compile it as modules, choose M here: the modules will be + called ircomm and ircomm_tty. IrCOMM implements serial port emulation, and makes it possible to use all existing applications that understands TTY's with an infrared link. Thus you should be able to use application like PPP, - minicom and others. Enabling this option will create two modules - called ircomm and ircomm_tty. + minicom and others. diff --git a/net/irda/irnet/Kconfig b/net/irda/irnet/Kconfig index e1ff6de225b1a..7ea4f2421442c 100644 --- a/net/irda/irnet/Kconfig +++ b/net/irda/irnet/Kconfig @@ -2,11 +2,10 @@ config IRNET tristate "IrNET protocol" depends on IRDA && PPP help - Say Y here if you want to build support for the IrNET protocol. If - you want to compile it as a module (irnet), say M here and read - . IrNET is a PPP driver, so you - will also need a working PPP subsystem (driver, daemon and - config)... + Say Y here if you want to build support for the IrNET protocol. + To compile it as a module, choose M here: the module will be + called irnet. IrNET is a PPP driver, so you will also need a + working PPP subsystem (driver, daemon and config)... IrNET is an alternate way to tranfer TCP/IP traffic over IrDA. It uses synchronous PPP over a set of point to point IrDA sockets. You diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig index bc39073b94f82..865c0f0b93517 100644 --- a/net/sctp/Kconfig +++ b/net/sctp/Kconfig @@ -32,10 +32,8 @@ config IP_SCTP -- network-level fault tolerance through supporting of multi- homing at either or both ends of an association." - 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 sctp. If you want to compile it - as a module, say M here and read . + To compile this protocol support as a module, choose M here: the + module will be called sctp. If in doubt, say N. diff --git a/sound/Kconfig b/sound/Kconfig index 28d9624b92d9e..bfd4b6ab24c26 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -22,12 +22,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 ), 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 as well - as ; 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 ; 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/sound/oss/Kconfig b/sound/oss/Kconfig index 6f540f48c795a..cffa8e6789c64 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -17,10 +17,8 @@ config SOUND_BT878 don't need this driver as most TV cards handle sound with a short cable from the TV card to your sound card's line-in. - This driver is available as a module called btaudio ( = 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 . + To compile this driver as a module, choose M here: the module will + be called btaudio. config SOUND_CMPCI tristate "C-Media PCI (CMI8338/8738)" -- 2.53.0