diff options
| author | Bjorn Helgaas | 2019-07-12 17:08:23 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2019-07-12 17:08:23 -0500 |
| commit | b6a001c0cb2d29b77596a142aad5249044a6c119 (patch) | |
| tree | 20c8504f4fea46bf421107074f511fd51acf44fc /drivers | |
| parent | a188339ca5a396acc588e5851ed7e19f66b0ebd9 (diff) | |
| parent | 151f4e2bdc7a04020ae5c533896fb91a16e1f501 (diff) | |
Merge branch 'pci/docs'
- Convert docs to reST (Changbin Du)
- Convert PM docs to reST (Mauro Carvalho Chehab)
* pci/docs:
docs: power: convert docs to ReST and rename to *.rst
Documentation: PCI: convert endpoint/pci-test-howto.txt to reST
Documentation: PCI: convert endpoint/pci-test-function.txt to reST
Documentation: PCI: convert endpoint/pci-endpoint-cfs.txt to reST
Documentation: PCI: convert endpoint/pci-endpoint.txt to reST
Documentation: PCI: convert pcieaer-howto.txt to reST
Documentation: PCI: convert pci-error-recovery.txt to reST
Documentation: PCI: convert acpi-info.txt to reST
Documentation: PCI: convert MSI-HOWTO.txt to reST
Documentation: PCI: convert pci-iov-howto.txt to reST
Documentation: PCI: convert PCIEBUS-HOWTO.txt to reST
Documentation: PCI: convert pci.txt to reST
Documentation: add Linux PCI to Sphinx TOC tree
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 | ||||
| -rw-r--r-- | drivers/opp/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/power/supply/power_supply_core.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 066fd2a12851..10d040e2e807 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1175,7 +1175,7 @@ struct skl_wm_params { * to be disabled. This shouldn't happen and we'll print some error messages in * case it happens. * - * For more, read the Documentation/power/runtime_pm.txt. + * For more, read the Documentation/power/runtime_pm.rst. */ struct i915_runtime_pm { atomic_t wakeref_count; diff --git a/drivers/opp/Kconfig b/drivers/opp/Kconfig index a7fbb93f302c..1f64a3d46c8a 100644 --- a/drivers/opp/Kconfig +++ b/drivers/opp/Kconfig @@ -10,4 +10,4 @@ config PM_OPP OPP layer organizes the data internally using device pointers representing individual voltage domains and provides SOC implementations a ready to use framework to manage OPPs. - For more information, read <file:Documentation/power/opp.txt> + For more information, read <file:Documentation/power/opp.rst> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index f7033ecf6d0b..11f9c875b028 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -607,7 +607,7 @@ int power_supply_get_battery_info(struct power_supply *psy, /* The property and field names below must correspond to elements * in enum power_supply_property. For reasoning, see - * Documentation/power/power_supply_class.txt. + * Documentation/power/power_supply_class.rst. */ of_property_read_u32(battery_np, "energy-full-design-microwatt-hours", |