From 14810e1f31a9d8210d535e6243ccd712664cf573 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 17 Feb 2004 23:25:48 -0800 Subject: [PATCH] [PATCH] move CONFIG_HOTPLUG to init/Kconfig As a bonus: cris, h8300, m68k and sparc can use CONFIG_HOTPLUG now. --- arch/alpha/Kconfig | 18 ------------------ arch/arm/Kconfig | 18 ------------------ arch/arm26/Kconfig | 18 ------------------ arch/i386/Kconfig | 18 ------------------ arch/ia64/Kconfig | 18 ------------------ arch/m68knommu/Kconfig | 18 ------------------ arch/mips/Kconfig | 18 ------------------ arch/ppc/Kconfig | 18 ------------------ arch/ppc64/Kconfig | 18 ------------------ arch/sh/Kconfig | 18 ------------------ arch/sparc64/Kconfig | 18 ------------------ arch/v850/Kconfig | 18 ------------------ arch/x86_64/Kconfig | 18 ------------------ drivers/parisc/Kconfig | 18 ------------------ drivers/s390/Kconfig | 22 ---------------------- init/Kconfig | 19 +++++++++++++++++++ 16 files changed, 19 insertions(+), 274 deletions(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 72ffe90d913c3..8e07ec68977bb 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -569,24 +569,6 @@ config VERBOSE_MCHECK_ON source "drivers/pci/Kconfig" source "drivers/eisa/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" config SRM_ENV diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0ff30774e762f..ff3cf4e06c28f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -365,24 +365,6 @@ endif source "drivers/pci/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" comment "At least one math emulation must be selected" diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig index 05a9a2e556677..48d8a943b8d54 100644 --- a/arch/arm26/Kconfig +++ b/arch/arm26/Kconfig @@ -118,24 +118,6 @@ config XIP_KERNEL Select this option to create a kernel that can be programed into the OS ROMs. -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - comment "At least one math emulation must be selected" config FPE_NWFPE diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 52e6730c4d648..5754cc95b1771 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -1131,24 +1131,6 @@ config SCx200 This support is also available as a module. If compiled as a module, it will be called scx200. -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 89fb4d888fa24..468944ab5a951 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -439,24 +439,6 @@ config PCI_DOMAINS source "drivers/pci/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable devices" - help - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pci/hotplug/Kconfig" source "drivers/pcmcia/Kconfig" diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index 7475df436f008..8d33dd156076a 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -464,24 +464,6 @@ config COMEMPCI source "drivers/pci/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable device" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index f7dc991d16317..a5c22b93f64c8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1104,24 +1104,6 @@ config MCA config SBUS bool -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 74029be4365b2..188bf701572a2 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -978,24 +978,6 @@ config PCI_PERMEDIA source "drivers/pci/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" endmenu diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index a434f2885ed2d..0e177601c2c4e 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig @@ -227,24 +227,6 @@ source "fs/Kconfig.binfmt" source "drivers/pci/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 059688e68efec..801f53abfec8a 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -609,24 +609,6 @@ source "arch/sh/drivers/pci/Kconfig" source "drivers/pci/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index e8bc2e4d835d2..a75e66ba98ade 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -186,24 +186,6 @@ config SPARC64 SPARC64 ports; its web page is available at . -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - # Global things across all Sun machines. config RWSEM_GENERIC_SPINLOCK bool diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig index ecf465ed751be..8665652e24e6c 100644 --- a/arch/v850/Kconfig +++ b/arch/v850/Kconfig @@ -236,24 +236,6 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" source "drivers/pci/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable device" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index a76b4dd5c4d15..86ea1c0c83369 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -315,24 +315,6 @@ config PCI_USE_VECTOR source "drivers/pci/Kconfig" -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well-known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems, or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig index fa875ae1cac2b..aa88c41004dff 100644 --- a/drivers/parisc/Kconfig +++ b/drivers/parisc/Kconfig @@ -143,24 +143,6 @@ config PDC_CHASSIS This has nothing to do with Chassis LCD and LED support. If unsure, say Y. - -config HOTPLUG - bool "Support for hot-pluggable devices" - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. source "drivers/pcmcia/Kconfig" diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig index 864438858b8e6..3b60f573fad08 100644 --- a/drivers/s390/Kconfig +++ b/drivers/s390/Kconfig @@ -164,25 +164,3 @@ config S390_TAPE_34XX It is safe to say "Y" here. endmenu - - -config HOTPLUG - bool - default y - ---help--- - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at ) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. - - diff --git a/init/Kconfig b/init/Kconfig index 25451407f203b..fa501dc7bab57 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -137,6 +137,25 @@ config LOG_BUF_SHIFT 13 => 8 KB 12 => 4 KB +config HOTPLUG + bool "Support for hot-pluggable devices" if !ARCH_S390 + default ARCH_S390 + help + Say Y here if you want to plug devices into your computer while + the system is running, and be able to use them quickly. In many + cases, the devices can likewise be unplugged at any time too. + + One well known example of this is PCMCIA- or PC-cards, credit-card + size devices such as network cards, modems or hard drives which are + plugged into slots found on all modern laptop computers. Another + example, used on modern desktops as well as laptops, is USB. + + Enable HOTPLUG and KMOD, and build a modular kernel. Get agent + software (at ) and install it. + Then your kernel will automatically call out to a user mode "policy + agent" (/sbin/hotplug) to load modules and set up software needed + to use devices as you hotplug them. + config IKCONFIG bool "Kernel .config support" ---help--- -- 2.53.0