char: group dev configs togther

Group /dev/{mem,kmem,nvram,raw,port} driver configs together.
This also means that tty configs are now grouped together instead
of being split up.

This just moves Kconfig lines around. There are no other changes.

Cc: linux-serial@vger.kernel.org
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/20200311225736.32147-2-rdunlap@infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 26956c0..b77f796 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -7,25 +7,6 @@ menu "Character devices"
 
 source "drivers/tty/Kconfig"
 
-config DEVMEM
-       bool "/dev/mem virtual device support"
-       default y
-       help
-         Say Y here if you want to support the /dev/mem device.
-         The /dev/mem device is used to access areas of physical
-         memory.
-         When in doubt, say "Y".
-
-config DEVKMEM
-       bool "/dev/kmem virtual device support"
-       # On arm64, VMALLOC_START < PAGE_OFFSET, which confuses kmem read/write
-       depends on !ARM64
-       help
-         Say Y here if you want to support the /dev/kmem device. The
-         /dev/kmem device is rarely used, but can be used for certain
-         kind of kernel debugging operations.
-         When in doubt, say "N".
-
 source "drivers/tty/serial/Kconfig"
 source "drivers/tty/serdev/Kconfig"
 
@@ -220,29 +201,6 @@ config NWFLASH
 
 source "drivers/char/hw_random/Kconfig"
 
-config NVRAM
-       tristate "/dev/nvram support"
-       depends on X86 || HAVE_ARCH_NVRAM_OPS
-       default M68K || PPC
-       ---help---
-         If you say Y here and create a character special file /dev/nvram
-         with major number 10 and minor number 144 using mknod ("man mknod"),
-         you get read and write access to the non-volatile memory.
-
-         /dev/nvram may be used to view settings in NVRAM or to change them
-         (with some utility). It could also be used to frequently
-         save a few bits of very important data that may not be lost over
-         power-off and for which writing to disk is too insecure. Note
-         however that most NVRAM space in a PC belongs to the BIOS and you
-         should NEVER idly tamper with it. See Ralf Brown's interrupt list
-         for a guide to the use of CMOS bytes by your BIOS.
-
-         This memory is conventionally called "NVRAM" on PowerPC machines,
-         "CMOS RAM" on PCs, "NVRAM" on Ataris and "PRAM" on Macintoshes.
-
-         To compile this driver as a module, choose M here: the
-         module will be called nvram.
-
 #
 # These legacy RTC drivers just cause too many conflicts with the generic
 # RTC framework ... let's not even try to coexist any more.
@@ -431,6 +389,48 @@ config NSC_GPIO
          pc8736x_gpio drivers.  If those drivers are built as
          modules, this one will be too, named nsc_gpio
 
+config DEVMEM
+       bool "/dev/mem virtual device support"
+       default y
+       help
+         Say Y here if you want to support the /dev/mem device.
+         The /dev/mem device is used to access areas of physical
+         memory.
+         When in doubt, say "Y".
+
+config DEVKMEM
+       bool "/dev/kmem virtual device support"
+       # On arm64, VMALLOC_START < PAGE_OFFSET, which confuses kmem read/write
+       depends on !ARM64
+       help
+         Say Y here if you want to support the /dev/kmem device. The
+         /dev/kmem device is rarely used, but can be used for certain
+         kind of kernel debugging operations.
+         When in doubt, say "N".
+
+config NVRAM
+       tristate "/dev/nvram support"
+       depends on X86 || HAVE_ARCH_NVRAM_OPS
+       default M68K || PPC
+       ---help---
+         If you say Y here and create a character special file /dev/nvram
+         with major number 10 and minor number 144 using mknod ("man mknod"),
+         you get read and write access to the non-volatile memory.
+
+         /dev/nvram may be used to view settings in NVRAM or to change them
+         (with some utility). It could also be used to frequently
+         save a few bits of very important data that may not be lost over
+         power-off and for which writing to disk is too insecure. Note
+         however that most NVRAM space in a PC belongs to the BIOS and you
+         should NEVER idly tamper with it. See Ralf Brown's interrupt list
+         for a guide to the use of CMOS bytes by your BIOS.
+
+         This memory is conventionally called "NVRAM" on PowerPC machines,
+         "CMOS RAM" on PCs, "NVRAM" on Ataris and "PRAM" on Macintoshes.
+
+         To compile this driver as a module, choose M here: the
+         module will be called nvram.
+
 config RAW_DRIVER
        tristate "RAW driver (/dev/raw/rawN)"
        depends on BLOCK
@@ -452,6 +452,14 @@ config MAX_RAW_DEVS
          Default is 256. Increase this number in case you need lots of
          raw devices.
 
+config DEVPORT
+       bool "/dev/port character device"
+       depends on ISA || PCI
+       default y
+       help
+         Say Y here if you want to support the /dev/port device. The /dev/port
+         device is similar to /dev/mem, but for I/O ports.
+
 config HPET
        bool "HPET - High Precision Event Timer" if (X86 || IA64)
        default n
@@ -511,14 +519,6 @@ config TELCLOCK
          /sys/devices/platform/telco_clock, with a number of files for
          controlling the behavior of this hardware.
 
-config DEVPORT
-       bool "/dev/port character device"
-       depends on ISA || PCI
-       default y
-       help
-         Say Y here if you want to support the /dev/port device. The /dev/port
-         device is similar to /dev/mem, but for I/O ports.
-
 source "drivers/s390/char/Kconfig"
 
 source "drivers/char/xillybus/Kconfig"