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 <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Cc: Alexandre Belloni <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Vegard Nossum <[email protected]> Reviewed-by: Randy Dunlap <[email protected]> Signed-off-by: Jonathan Corbet <[email protected]> Link: https://lore.kernel.org/r/[email protected]
joeyli · Jan 3, 2024 · 77e0755 · 77e0755
1 parent 89405db
commit 77e0755
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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/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/driver-api/isapnp.rst → Documentation/userspace-api/isapnp.rst b/Documentation/driver-api/isapnp.rst → Documentation/userspace-api/isapnp.rst
@@ -1,11 +1,11 @@
-==========================================================
-ISA Plug & Play support by Jaroslav Kysela <[email protected]>
-==========================================================
+=======================
+ISA Plug & Play support
+=======================
 
 Interface /proc/isapnp
 ======================
 
-The interface has been removed. See pnp.txt for more details.
+The interface was removed in kernel 2.5.53. See pnp.rst for more details.
 
 Interface /proc/bus/isapnp
 ==========================

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -11252,7 +11252,7 @@ F:	drivers/media/radio/radio-isa*
 ISAPNP
 M:	Jaroslav Kysela <[email protected]>
 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
@@ -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 <file:Documentation/driver-api/isapnp.rst>.
+	  Some information is in <file:Documentation/userspace-api/isapnp.rst>.
 
 	  If unsure, say Y.
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,6 @@ available subsections can be seen below. @@
        dcdbas
        eisa
        isa
-       isapnp
        io-mapping
        io_ordering
        generic-counter
@@ Expand Down @@