diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-22 17:38:38 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-22 17:38:38 +0100 |
commit | 42a62da0ae660e71c280bd8b287b994c1af1352c (patch) | |
tree | f0c091088e98037f9cf86c62c64b335ab1aeb3fa /Documentation/driver-api | |
parent | tty: n_gsm: Delete unneeded semicolon (diff) | |
parent | Linux 6.1-rc6 (diff) | |
download | linux-42a62da0ae660e71c280bd8b287b994c1af1352c.tar.xz linux-42a62da0ae660e71c280bd8b287b994c1af1352c.zip |
Merge 6.1-rc6 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/driver-api')
-rw-r--r-- | Documentation/driver-api/driver-model/devres.rst | 1 | ||||
-rw-r--r-- | Documentation/driver-api/miscellaneous.rst | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index 687adb58048e..56082265e8e5 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -279,6 +279,7 @@ GPIO devm_gpio_request_one() I2C + devm_i2c_add_adapter() devm_i2c_new_dummy_device() IIO diff --git a/Documentation/driver-api/miscellaneous.rst b/Documentation/driver-api/miscellaneous.rst index 304ffb146cf9..4a5104a368ac 100644 --- a/Documentation/driver-api/miscellaneous.rst +++ b/Documentation/driver-api/miscellaneous.rst @@ -16,12 +16,11 @@ Parallel Port Devices 16x50 UART Driver ================= -.. kernel-doc:: drivers/tty/serial/serial_core.c - :export: - .. kernel-doc:: drivers/tty/serial/8250/8250_core.c :export: +See serial/driver.rst for related APIs. + Pulse-Width Modulation (PWM) ============================ |