diff options
| author | Balló György | 2016-01-20 04:15:34 +0100 |
|---|---|---|
| committer | Balló György | 2016-01-20 04:15:34 +0100 |
| commit | f8c29e8fc8eb8e315fe6925e1c90968414d3e4fb (patch) | |
| tree | d6b38325b1538060ae2213fad8e732be240c0364 /linux-4.3.patch | |
| parent | 7b9aea76f38b769cbd1e721efd7a26b9aa7bcb73 (diff) | |
| download | aur-f8c29e8fc8eb8e315fe6925e1c90968414d3e4fb.tar.gz | |
upgpkg: nvidia-96xx-dkms 96.43.23-5
Update to linux 4.3
Diffstat (limited to 'linux-4.3.patch')
| -rw-r--r-- | linux-4.3.patch | 18 |
1 files changed, 16 insertions, 2 deletions
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 |