diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-08-16 09:11:17 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-08-16 09:11:17 +0300 |
| commit | b2eb7d716426fe056596761cd371005d64e9caec (patch) | |
| tree | 436d0566cf4bc900522c9dbf1e203234ef65b2f7 /drivers/gpu/drm/drm_property.c | |
| parent | 2817efaeb608421d8f6fe7939826c35a852644e9 (diff) | |
| parent | 2819cf0e7dbe45a2bccf2f6c60fe6a27b299cc3e (diff) | |
Merge drm/drm-next into drm-intel-next
Catch up with drm core changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/drm_property.c')
| -rw-r--r-- | drivers/gpu/drm/drm_property.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c index 27c824a6eb60..6c353c9dc772 100644 --- a/drivers/gpu/drm/drm_property.c +++ b/drivers/gpu/drm/drm_property.c @@ -434,7 +434,7 @@ EXPORT_SYMBOL(drm_property_add_enum); /** * drm_property_destroy - destroy a drm property * @dev: drm device - * @property: property to destry + * @property: property to destroy * * This function frees a property including any attached resources like * enumeration values. |