Messages in this thread Patch in this message | | | From | Linus Torvalds <> | Date | Wed, 3 Aug 2016 12:49:03 -0400 | Subject | Re: Drm compile errors. |
| |
On Wed, Aug 3, 2016 at 10:43 AM, Jörg Otte <jrg.otte@gmail.com> wrote: > Current mainline kernel does not compile for me:
You've managed to turn of DEBUG_FS, which is actually fairly hard considering how many things select it.
Does the attached trivial patch fix it for you?
Linus drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 915a3d0acff3..21f939074abc 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3651,8 +3651,8 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv); int i915_debugfs_connector_add(struct drm_connector *connector); void intel_display_crc_init(struct drm_device *dev); #else -static inline int i915_debugfs_register(struct drm_i915_private *) {return 0;} -static inline void i915_debugfs_unregister(struct drm_i915_private *) {} +static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {return 0;} +static inline void i915_debugfs_unregister(struct drm_i915_private *dev_priv) {} static inline int i915_debugfs_connector_add(struct drm_connector *connector) { return 0; } static inline void intel_display_crc_init(struct drm_device *dev) {} | |