Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

[cascardo/linux.git] / drivers / gpu / drm / i915 / i915_drv.h

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c1e61ff..96d5034 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3833,11 +3833,6 @@ static inline i915_reg_t i915_vgacntrl_reg(struct drm_device *dev)
                return VGACNTRL;
 }
 
-static inline void __user *to_user_ptr(u64 address)
-{
-       return (void __user *)(uintptr_t)address;
-}
-
 static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m)
 {
        unsigned long j = msecs_to_jiffies(m);