diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 10:36:39 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 10:36:39 +0100 |
| commit | c24889167583c2e7fbd1a9e12ef508c8405f6fd4 (patch) | |
| tree | 4be6b8654d135b554253b6ab22c314260a413751 /include/linux/device.h | |
| parent | 38bf57fa7b671f2bf7530888aa8199450265c5c8 (diff) | |
| parent | 868c97a846a73e937d835b09b8c885a69df50ec8 (diff) | |
| download | linux-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.tar.gz linux-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.tar.bz2 linux-c24889167583c2e7fbd1a9e12ef508c8405f6fd4.zip | |
Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next
Backmerge the docs-next branch from Jon into drm-misc so that we can
apply the dma-buf documentation cleanup patches. Git found a conflict
where there was none because both drm-misc and docs had identical
patches to clean up file rename issues in the rst include directives.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index bc41e87a969b..36d3a9867da9 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -733,7 +733,7 @@ struct device_dma_parameters { * minimizes board-specific #ifdefs in drivers. * @driver_data: Private pointer for driver specific info. * @power: For device power management. - * See Documentation/power/devices.txt for details. + * See Documentation/power/admin-guide/devices.rst for details. * @pm_domain: Provide callbacks that are executed during system suspend, * hibernation, system resume and during runtime PM transitions * along with subsystem-level and driver-level callbacks. |