upgpkg: nvidia-96xx-dkms 96.43.23-5

Update to linux 4.3

3 files changed, 19 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8175876255a4..32a713234fb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Jan 20 01:16:07 UTC 2016
+# Wed Jan 20 03:15:34 UTC 2016
 pkgbase = nvidia-96xx-dkms
 	pkgdesc = NVIDIA kernel module sources (DKMS), 96xx branch
 	pkgver = 96.43.23
@@ -30,7 +30,7 @@ pkgbase = nvidia-96xx-dkms
 	md5sums = a613531fc6a5610e8e07b1dded071901
 	md5sums = ab3e06a699bfd0a91ab77a88e112ad44
 	md5sums = 89072d9c1b37867f01dd7a41521c0ed1
-	md5sums = 75273776a44fdb0fa8caa9479ce00094
+	md5sums = 20bde657bb715e16295d7e82fe799fca
 	md5sums = d28e74675462b215f080960c130c43fc
 
 pkgname = nvidia-96xx-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 2597e27741c3..b0fef50054e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,7 +35,7 @@ md5sums+=('944ed806c8d0f9174d5e9e16ae065bf6'
           'a613531fc6a5610e8e07b1dded071901'
           'ab3e06a699bfd0a91ab77a88e112ad44'
           '89072d9c1b37867f01dd7a41521c0ed1'
-          '75273776a44fdb0fa8caa9479ce00094'
+          '20bde657bb715e16295d7e82fe799fca'
           'd28e74675462b215f080960c130c43fc')
 
 prepare() {
diff --git a/linux-4.3.patch b/linux-4.3.patch
index 9ce8211fe2d5..30dd5fe79a0c 100644
--- a/linux-4.3.patch
+++ b/linux-4.3.patch
@@ -1,6 +1,6 @@
 diff -Naur nv.orig/nv.c nv/nv.c
---- nv.orig/nv.c	2016-01-20 01:34:02.096524000 +0100
-+++ nv/nv.c	2016-01-20 01:36:47.610695762 +0100
+--- nv.orig/nv.c	2016-01-20 04:11:03.974819000 +0100
++++ nv/nv.c	2016-01-20 04:11:48.095900342 +0100
 @@ -574,7 +574,8 @@
      void *v
  )
@@ -11,3 +11,17 @@ diff -Naur nv.orig/nv.c nv/nv.c
  }
  
  NV_DEFINE_PROCFS_SINGLE_FILE(text_file);
+diff -Naur nv.orig/nv-linux.h nv/nv-linux.h
+--- nv.orig/nv-linux.h	2016-01-20 04:11:03.958152000 +0100
++++ nv/nv-linux.h	2016-01-20 04:11:48.095900342 +0100
+@@ -143,6 +143,10 @@
+ #include <linux/seq_file.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
++#undef CONFIG_MTRR
++#endif
++
+ #ifdef CONFIG_MTRR
+ #include <asm/mtrr.h>
+ #endif