Merge tag 'drm-intel-next-fixes-2016-05-25' of git://anongit.freedesktop.org/drm...

[karo-tx-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 250992995ac87d99ce8f5f679a0f9ffae1184a1c..5faacc6e548d65cde601f478aa16c3efb7a5c6ca 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3676,11 +3676,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);