diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-12-06 01:09:33 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-12-06 02:17:51 +0300 |
| commit | 467e8a516dcf922d1ea343cebb0e751f81f0dca3 (patch) | |
| tree | c22b6d971e922223286a4a181d6701c7d32e523d /fs | |
| parent | 818182dd1097fdc492aaef9b08755ea13274352d (diff) | |
| parent | 4377d4e0d3d511986033ba7b4182d5a80b7f9ea2 (diff) | |
| download | linux-467e8a516dcf922d1ea343cebb0e751f81f0dca3.tar.xz | |
Merge tag 'drm-intel-next-2018-12-04' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Final drm/i915 changes for v4.21:
- ICL DSI video mode enabling (Madhav, Vandita, Jani, Imre)
- eDP sink count fix (José)
- PSR fixes (José)
- DRM DP helper and i915 DSC enabling (Manasi, Gaurav, Anusha)
- DP FEC enabling (Anusha)
- SKL+ watermark/ddb programming improvements (Ville)
- Pixel format fixes (Ville)
- Selftest updates (Chris, Tvrtko)
- GT and engine workaround improvements (Tvrtko)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87va496uoe.fsf@intel.com
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/sysfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 0a7252aecfa5..bb71db63c99c 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -334,7 +334,7 @@ int sysfs_create_file_ns(struct kobject *kobj, const struct attribute *attr, } EXPORT_SYMBOL_GPL(sysfs_create_file_ns); -int sysfs_create_files(struct kobject *kobj, const struct attribute **ptr) +int sysfs_create_files(struct kobject *kobj, const struct attribute * const *ptr) { int err = 0; int i; @@ -493,7 +493,7 @@ bool sysfs_remove_file_self(struct kobject *kobj, const struct attribute *attr) return ret; } -void sysfs_remove_files(struct kobject *kobj, const struct attribute **ptr) +void sysfs_remove_files(struct kobject *kobj, const struct attribute * const *ptr) { int i; for (i = 0; ptr[i]; i++) |