summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/admin-guide/laptops/sonypi.rst28
-rw-r--r--Documentation/admin-guide/laptops/toshiba_haps.rst8
-rw-r--r--Documentation/driver-api/nvdimm/btt.rst2
-rw-r--r--Documentation/s390/debugging390.rst2
4 files changed, 19 insertions, 21 deletions
diff --git a/Documentation/admin-guide/laptops/sonypi.rst b/Documentation/admin-guide/laptops/sonypi.rst
index 2a1975ed7ee4..c6eaaf48f7c1 100644
--- a/Documentation/admin-guide/laptops/sonypi.rst
+++ b/Documentation/admin-guide/laptops/sonypi.rst
@@ -53,7 +53,7 @@ module or sonypi.<param>=<value> on the kernel boot line when sonypi is
53statically linked into the kernel). Those options are: 53statically linked into the kernel). Those options are:
54 54
55 =============== ======================================================= 55 =============== =======================================================
56 minor: minor number of the misc device /dev/sonypi, 56 minor: minor number of the misc device /dev/sonypi,
57 default is -1 (automatic allocation, see /proc/misc 57 default is -1 (automatic allocation, see /proc/misc
58 or kernel logs) 58 or kernel logs)
59 59
@@ -89,24 +89,22 @@ statically linked into the kernel). Those options are:
89 set to 0xffffffff, meaning that all possible events 89 set to 0xffffffff, meaning that all possible events
90 will be tried. You can use the following bits to 90 will be tried. You can use the following bits to
91 construct your own event mask (from 91 construct your own event mask (from
92 drivers/char/sonypi.h): 92 drivers/char/sonypi.h)::
93 93
94 ======================== ====== 94 SONYPI_JOGGER_MASK 0x0001
95 SONYPI_JOGGER_MASK 0x0001 95 SONYPI_CAPTURE_MASK 0x0002
96 SONYPI_CAPTURE_MASK 0x0002 96 SONYPI_FNKEY_MASK 0x0004
97 SONYPI_FNKEY_MASK 0x0004 97 SONYPI_BLUETOOTH_MASK 0x0008
98 SONYPI_BLUETOOTH_MASK 0x0008 98 SONYPI_PKEY_MASK 0x0010
99 SONYPI_PKEY_MASK 0x0010 99 SONYPI_BACK_MASK 0x0020
100 SONYPI_BACK_MASK 0x0020 100 SONYPI_HELP_MASK 0x0040
101 SONYPI_HELP_MASK 0x0040 101 SONYPI_LID_MASK 0x0080
102 SONYPI_LID_MASK 0x0080 102 SONYPI_ZOOM_MASK 0x0100
103 SONYPI_ZOOM_MASK 0x0100 103 SONYPI_THUMBPHRASE_MASK 0x0200
104 SONYPI_THUMBPHRASE_MASK 0x0200
105 SONYPI_MEYE_MASK 0x0400 104 SONYPI_MEYE_MASK 0x0400
106 SONYPI_MEMORYSTICK_MASK 0x0800 105 SONYPI_MEMORYSTICK_MASK 0x0800
107 SONYPI_BATTERY_MASK 0x1000 106 SONYPI_BATTERY_MASK 0x1000
108 SONYPI_WIRELESS_MASK 0x2000 107 SONYPI_WIRELESS_MASK 0x2000
109 ======================== ======
110 108
111 useinput: if set (which is the default) two input devices are 109 useinput: if set (which is the default) two input devices are
112 created, one which interprets the jogdial events as 110 created, one which interprets the jogdial events as
diff --git a/Documentation/admin-guide/laptops/toshiba_haps.rst b/Documentation/admin-guide/laptops/toshiba_haps.rst
index 11dfc428c080..d28b6c3f2849 100644
--- a/Documentation/admin-guide/laptops/toshiba_haps.rst
+++ b/Documentation/admin-guide/laptops/toshiba_haps.rst
@@ -75,11 +75,11 @@ The sysfs files under /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS620A:00/ are:
75protection_level The protection_level is readable and writeable, and 75protection_level The protection_level is readable and writeable, and
76 provides a way to let userspace query the current protection 76 provides a way to let userspace query the current protection
77 level, as well as set the desired protection level, the 77 level, as well as set the desired protection level, the
78 available protection levels are: 78 available protection levels are::
79 79
80 ============ ======= ========== ======== 80 ============ ======= ========== ========
81 0 - Disabled 1 - Low 2 - Medium 3 - High 81 0 - Disabled 1 - Low 2 - Medium 3 - High
82 ============ ======= ========== ======== 82 ============ ======= ========== ========
83 83
84reset_protection The reset_protection entry is writeable only, being "1" 84reset_protection The reset_protection entry is writeable only, being "1"
85 the only parameter it accepts, it is used to trigger 85 the only parameter it accepts, it is used to trigger
diff --git a/Documentation/driver-api/nvdimm/btt.rst b/Documentation/driver-api/nvdimm/btt.rst
index 2d8269f834bd..107395c042ae 100644
--- a/Documentation/driver-api/nvdimm/btt.rst
+++ b/Documentation/driver-api/nvdimm/btt.rst
@@ -83,7 +83,7 @@ flags, and the remaining form the internal block number.
83======== ============================================================= 83======== =============================================================
84Bit Description 84Bit Description
85======== ============================================================= 85======== =============================================================
8631 - 30 Error and Zero flags - Used in the following way: 8631 - 30 Error and Zero flags - Used in the following way::
87 87
88 == == ==================================================== 88 == == ====================================================
89 31 30 Description 89 31 30 Description
diff --git a/Documentation/s390/debugging390.rst b/Documentation/s390/debugging390.rst
index d49305fd5e1a..73ad0b06c666 100644
--- a/Documentation/s390/debugging390.rst
+++ b/Documentation/s390/debugging390.rst
@@ -170,7 +170,7 @@ currently running at.
170| +----------------+-------------------------------------------------+ 170| +----------------+-------------------------------------------------+
171| | 32 | Basic Addressing Mode | 171| | 32 | Basic Addressing Mode |
172| | | | 172| | | |
173| | | Used to set addressing mode | 173| | | Used to set addressing mode:: |
174| | | | 174| | | |
175| | | +---------+----------+----------+ | 175| | | +---------+----------+----------+ |
176| | | | PSW 31 | PSW 32 | | | 176| | | | PSW 31 | PSW 32 | | |