[PATCH 1/2] Documentation: move driver-api/isapnp to userspace-api/

[Vegard Nossum]

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 <perex@xxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Cc: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxxx>
---
 Documentation/driver-api/index.rst                     | 1 -
 Documentation/userspace-api/index.rst                  | 1 +
 Documentation/{driver-api => userspace-api}/isapnp.rst | 8 ++++----
 MAINTAINERS                                            | 2 +-
 drivers/pnp/isapnp/Kconfig                             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename Documentation/{driver-api => userspace-api}/isapnp.rst (51%)

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/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/driver-api/isapnp.rst b/Documentation/userspace-api/isapnp.rst
similarity index 51%
rename from Documentation/driver-api/isapnp.rst
rename to Documentation/userspace-api/isapnp.rst
index 8d0840ac847b..d6fceb19b8ae 100644
--- a/Documentation/driver-api/isapnp.rst
+++ b/Documentation/userspace-api/isapnp.rst
@@ -1,11 +1,11 @@
-==========================================================
-ISA Plug & Play support by Jaroslav Kysela <perex@xxxxxxx>
-==========================================================
+=======================
+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
index 0506d14340f7..7b6d2dbe4f1d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11252,7 +11252,7 @@ F:	drivers/media/radio/radio-isa*
 ISAPNP
 M:	Jaroslav Kysela <perex@xxxxxxxx>
 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 <file:Documentation/driver-api/isapnp.rst>.
+	  Some information is in <file:Documentation/userspace-api/isapnp.rst>.
 
 	  If unsure, say Y.
-- 
2.34.1