Date: Wednesday, January 17, 2018 @ 08:02:32 Author: svenstaro Revision: 314969
upgpkg: nvidia-340xx 340.106-1 Modified: nvidia-340xx/trunk/PKGBUILD Deleted: nvidia-340xx/trunk/kernel-4.14.patch -------------------+ PKGBUILD | 2 +- kernel-4.14.patch | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-17 07:53:40 UTC (rev 314968) +++ PKGBUILD 2018-01-17 08:02:32 UTC (rev 314969) @@ -28,7 +28,7 @@ # patches here patch -Np0 < "${srcdir}/kernel-4.11.patch" - patch -Np1 < "${srcdir}/kernel-4.14.patch" + # patch -Np1 < "${srcdir}/kernel-4.14.patch" cp -a kernel kernel-dkms } Deleted: kernel-4.14.patch =================================================================== --- kernel-4.14.patch 2018-01-17 07:53:40 UTC (rev 314968) +++ kernel-4.14.patch 2018-01-17 08:02:32 UTC (rev 314969) @@ -1,29 +0,0 @@ -diff -u -r NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c ---- NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c 2017-09-15 01:16:51.000000000 +0200 -+++ NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c 2017-11-19 00:51:45.006654148 +0100 -@@ -173,8 +173,12 @@ - { - int ret = 0; - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver); -+#else - ret = drm_pci_init(&nv_drm_driver, pci_driver); - #endif -+#endif - return ret; - } - -@@ -183,8 +187,12 @@ - ) - { - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver); -+#else - drm_pci_exit(&nv_drm_driver, pci_driver); - #endif -+#endif - } - - RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(