summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
-rw-r--r--linux-4.11.patch24
3 files changed, 4 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ebbd41a20ee0..02c4ac98a7c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,10 +9,8 @@ pkgbase = nvidia-full-beta-all
options = !strip
source = 10-nvidia-drm-outputclass.conf
source = 20-nvidia.conf
- source = linux-4.11.patch
md5sums = 4f5562ee8f3171769e4638b35396c55d
md5sums = 2640eac092c220073f0668a7aaff61f7
- md5sums = cc8941b6898d9daa0fb67371f57a56b6
source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/384.59/NVIDIA-Linux-x86-384.59.run
md5sums_i686 = 8d2a2049d0509875c5dc0d9a0275aee4
source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/384.59/NVIDIA-Linux-x86_64-384.59-no-compat32.run
diff --git a/PKGBUILD b/PKGBUILD
index 41dd0818bef9..f227128f2489 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,13 +27,13 @@ fi
# Source
source=('10-nvidia-drm-outputclass.conf'
- '20-nvidia.conf'
- 'linux-4.11.patch')
+ '20-nvidia.conf')
+# 'linux-4.11.patch')
source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/$pkgver/NVIDIA-Linux-x86-$pkgver.run")
source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/$_pkg.run")
md5sums=('4f5562ee8f3171769e4638b35396c55d'
- '2640eac092c220073f0668a7aaff61f7'
- 'cc8941b6898d9daa0fb67371f57a56b6')
+ '2640eac092c220073f0668a7aaff61f7')
+# 'cc8941b6898d9daa0fb67371f57a56b6')
md5sums_i686=('8d2a2049d0509875c5dc0d9a0275aee4')
md5sums_x86_64=('778318b0fd2d5d511474a8987cc7dbe5')
[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('0f42f6706da80d32574371c8a0894e60')
diff --git a/linux-4.11.patch b/linux-4.11.patch
deleted file mode 100644
index dd6e508cfea2..000000000000
--- a/linux-4.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-linux.c
-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
-@@ -20,6 +20,8 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
-+#include <linux/version.h>
-+
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/err.h>
-@@ -196,7 +198,11 @@
- module_exit(nv_linux_drm_exit);
-
- #if defined(MODULE_LICENSE)
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)
-+ MODULE_LICENSE("Dual MIT/GPL");
-+#else
- MODULE_LICENSE("MIT");
-+#endif
- #endif
- #if defined(MODULE_INFO)
- MODULE_INFO(supported, "external");
-