diff -rupN nvidia-331-331.113/nv.c nvidia-331-331.113-sbv/nv.c
--- nvidia-331-331.113/nv.c	2014-12-10 15:22:15.000000000 +0100
+++ nvidia-331-331.113-sbv/nv.c	2015-05-08 16:04:58.245583732 +0200
@@ -2024,7 +2024,11 @@ nvidia_unlocked_ioctl(
     unsigned long i_arg
 )
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
+    return nvidia_ioctl(file_inode(file), file, cmd, i_arg);
+#else
     return nvidia_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
 }
 
 /*
diff -rupN nvidia-331-331.113/nv-drm.c nvidia-331-331.113-sbv/nv-drm.c
--- nvidia-331-331.113/nv-drm.c	2014-12-10 15:22:15.000000000 +0100
+++ nvidia-331-331.113-sbv/nv-drm.c	2015-05-08 16:03:40.857059809 +0200
@@ -18,6 +18,10 @@
 
 #include <drm/drmP.h>
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+#include <drm/drm_gem.h>
+#endif
+
 extern nv_linux_state_t *nv_linux_devices;
 
 struct nv_gem_object {
diff -rupN nvidia-331-331.113/nv-frontend.c nvidia-331-331.113-sbv/nv-frontend.c
--- nvidia-331-331.113/nv-frontend.c	2014-12-10 15:22:15.000000000 +0100
+++ nvidia-331-331.113-sbv/nv-frontend.c	2015-05-08 16:06:39.786270770 +0200
@@ -341,7 +341,11 @@ long nvidia_frontend_unlocked_ioctl(
     unsigned long i_arg
 )
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
+    return nvidia_frontend_ioctl(file_inode(file), file, cmd, i_arg);
+#else
     return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
 }
 
 long nvidia_frontend_compat_ioctl(
@@ -350,7 +354,11 @@ long nvidia_frontend_compat_ioctl(
     unsigned long i_arg
 )
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
+    return nvidia_frontend_ioctl(file_inode(file), file, cmd, i_arg);
+#else
     return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+#endif
 }
 
 int nvidia_frontend_mmap(