From 77e075579e88892510ddb7fda47ea15d74a5729f Mon Sep 17 00:00:00 2001 From: Vegard Nossum Date: Thu, 21 Dec 2023 13:48:15 +0100 Subject: Documentation: move driver-api/isapnp to userspace-api/ driver-api/isapnp documents /proc interfaces for interfacing directly with ISA Plug & Play devices, not any kind of API for kernel developers, and should thus also live under userspace-api/. Also fix a few issues while we're at it. Cc: Jaroslav Kysela Cc: Mauro Carvalho Chehab Cc: Alexandre Belloni Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Vegard Nossum Reviewed-by: Randy Dunlap Signed-off-by: Jonathan Corbet Link: https://lore.kernel.org/r/20231221124816.2978000-2-vegard.nossum@oracle.com --- Documentation/driver-api/index.rst | 1 - Documentation/driver-api/isapnp.rst | 15 --------------- Documentation/userspace-api/index.rst | 1 + Documentation/userspace-api/isapnp.rst | 15 +++++++++++++++ MAINTAINERS | 2 +- drivers/pnp/isapnp/Kconfig | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 Documentation/driver-api/isapnp.rst create mode 100644 Documentation/userspace-api/isapnp.rst diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst index 9511db303446..b1b82ac1063b 100644 --- a/Documentation/driver-api/index.rst +++ b/Documentation/driver-api/index.rst @@ -81,7 +81,6 @@ available subsections can be seen below. dcdbas eisa isa - isapnp io-mapping io_ordering generic-counter diff --git a/Documentation/driver-api/isapnp.rst b/Documentation/driver-api/isapnp.rst deleted file mode 100644 index 8d0840ac847b..000000000000 --- a/Documentation/driver-api/isapnp.rst +++ /dev/null @@ -1,15 +0,0 @@ -========================================================== -ISA Plug & Play support by Jaroslav Kysela -========================================================== - -Interface /proc/isapnp -====================== - -The interface has been removed. See pnp.txt for more details. - -Interface /proc/bus/isapnp -========================== - -This directory allows access to ISA PnP cards and logical devices. -The regular files contain the contents of ISA PnP registers for -a logical device. diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspace-api/index.rst index 93174ffc7350..277b7a40ca91 100644 --- a/Documentation/userspace-api/index.rst +++ b/Documentation/userspace-api/index.rst @@ -31,6 +31,7 @@ place where this information is gathered. vduse futex2 tee + isapnp .. only:: subproject and html diff --git a/Documentation/userspace-api/isapnp.rst b/Documentation/userspace-api/isapnp.rst new file mode 100644 index 000000000000..d6fceb19b8ae --- /dev/null +++ b/Documentation/userspace-api/isapnp.rst @@ -0,0 +1,15 @@ +======================= +ISA Plug & Play support +======================= + +Interface /proc/isapnp +====================== + +The interface was removed in kernel 2.5.53. See pnp.rst for more details. + +Interface /proc/bus/isapnp +========================== + +This directory allows access to ISA PnP cards and logical devices. +The regular files contain the contents of ISA PnP registers for +a logical device. diff --git a/MAINTAINERS b/MAINTAINERS index 9393c9b35f4d..cbafd63abacc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11252,7 +11252,7 @@ F: drivers/media/radio/radio-isa* ISAPNP M: Jaroslav Kysela S: Maintained -F: Documentation/driver-api/isapnp.rst +F: Documentation/userspace-api/isapnp.rst F: drivers/pnp/isapnp/ F: include/linux/isapnp.h diff --git a/drivers/pnp/isapnp/Kconfig b/drivers/pnp/isapnp/Kconfig index d0479a563123..8b5f2e461a80 100644 --- a/drivers/pnp/isapnp/Kconfig +++ b/drivers/pnp/isapnp/Kconfig @@ -7,6 +7,6 @@ config ISAPNP depends on ISA || COMPILE_TEST help Say Y here if you would like support for ISA Plug and Play devices. - Some information is in . + Some information is in . If unsure, say Y. -- cgit v1.2.3