diff options
| -rw-r--r-- | Documentation/admin-guide/index.rst | 1 | ||||
| -rw-r--r-- | Documentation/admin-guide/rapidio.rst (renamed from Documentation/driver-api/rapidio.rst) | 0 | ||||
| -rw-r--r-- | Documentation/driver-api/index.rst | 2 | ||||
| -rw-r--r-- | Documentation/driver-api/rapidio/index.rst (renamed from Documentation/rapidio/index.rst) | 2 | ||||
| -rw-r--r-- | Documentation/driver-api/rapidio/mport_cdev.rst (renamed from Documentation/rapidio/mport_cdev.rst) | 0 | ||||
| -rw-r--r-- | Documentation/driver-api/rapidio/rapidio.rst (renamed from Documentation/rapidio/rapidio.rst) | 0 | ||||
| -rw-r--r-- | Documentation/driver-api/rapidio/rio_cm.rst (renamed from Documentation/rapidio/rio_cm.rst) | 0 | ||||
| -rw-r--r-- | Documentation/driver-api/rapidio/sysfs.rst (renamed from Documentation/rapidio/sysfs.rst) | 0 | ||||
| -rw-r--r-- | Documentation/driver-api/rapidio/tsi721.rst (renamed from Documentation/rapidio/tsi721.rst) | 0 | ||||
| -rw-r--r-- | drivers/rapidio/Kconfig | 2 |
10 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst index 24fbe0568eff..8853c95ef0d4 100644 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst @@ -61,6 +61,7 @@ configure specific aspects of kernel behavior to your liking. parport md module-signing + rapidio sysrq unicode vga-softcursor diff --git a/Documentation/driver-api/rapidio.rst b/Documentation/admin-guide/rapidio.rst index 71ff658ab78e..71ff658ab78e 100644 --- a/Documentation/driver-api/rapidio.rst +++ b/Documentation/admin-guide/rapidio.rst diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst index 6cd750a03ea0..d665cd9ab95f 100644 --- a/Documentation/driver-api/index.rst +++ b/Documentation/driver-api/index.rst @@ -45,7 +45,7 @@ available subsections can be seen below. miscellaneous mei/index w1 - rapidio + rapidio/index s390-drivers vme 80211/index diff --git a/Documentation/rapidio/index.rst b/Documentation/driver-api/rapidio/index.rst index ab7b5541b346..4c5e51a05134 100644 --- a/Documentation/rapidio/index.rst +++ b/Documentation/driver-api/rapidio/index.rst @@ -1,5 +1,3 @@ -:orphan: - =========================== The Linux RapidIO Subsystem =========================== diff --git a/Documentation/rapidio/mport_cdev.rst b/Documentation/driver-api/rapidio/mport_cdev.rst index df77a7f7be7d..df77a7f7be7d 100644 --- a/Documentation/rapidio/mport_cdev.rst +++ b/Documentation/driver-api/rapidio/mport_cdev.rst diff --git a/Documentation/rapidio/rapidio.rst b/Documentation/driver-api/rapidio/rapidio.rst index fb8942d3ba85..fb8942d3ba85 100644 --- a/Documentation/rapidio/rapidio.rst +++ b/Documentation/driver-api/rapidio/rapidio.rst diff --git a/Documentation/rapidio/rio_cm.rst b/Documentation/driver-api/rapidio/rio_cm.rst index 5294430a7a74..5294430a7a74 100644 --- a/Documentation/rapidio/rio_cm.rst +++ b/Documentation/driver-api/rapidio/rio_cm.rst diff --git a/Documentation/rapidio/sysfs.rst b/Documentation/driver-api/rapidio/sysfs.rst index 540f72683496..540f72683496 100644 --- a/Documentation/rapidio/sysfs.rst +++ b/Documentation/driver-api/rapidio/sysfs.rst diff --git a/Documentation/rapidio/tsi721.rst b/Documentation/driver-api/rapidio/tsi721.rst index 42aea438cd20..42aea438cd20 100644 --- a/Documentation/rapidio/tsi721.rst +++ b/Documentation/driver-api/rapidio/tsi721.rst diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig index 467e8fa06904..677d1aff61b7 100644 --- a/drivers/rapidio/Kconfig +++ b/drivers/rapidio/Kconfig @@ -86,7 +86,7 @@ config RAPIDIO_CHMAN This option includes RapidIO channelized messaging driver which provides socket-like interface to allow sharing of single RapidIO messaging mailbox between multiple user-space applications. - See "Documentation/rapidio/rio_cm.rst" for driver description. + See "Documentation/driver-api/rapidio/rio_cm.rst" for driver description. config RAPIDIO_MPORT_CDEV tristate "RapidIO /dev mport device driver" |