From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 18 Nov 2017 14:28:52 +0000 (+0100)
Subject: - fix kernel 4.14 patch
X-Git-Tag: auto/th/xorg-driver-video-nvidia-legacy-340xx-340.104-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia-legacy-340xx.git;a=commitdiff_plain;h=c861685

- fix kernel 4.14 patch
- rel 2
---

diff --git a/kernel-4.14.patch b/kernel-4.14.patch
index 9aae52c..02f2730 100644
--- a/kernel-4.14.patch
+++ b/kernel-4.14.patch
@@ -14,21 +14,27 @@ diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
 index 2aa7cc8..23df996 100644
 --- a/kernel/nv-drm.c
 +++ b/kernel/nv-drm.c
-@@ -173,7 +173,7 @@ int __init nv_drm_init(
+@@ -173,7 +173,11 @@ int __init nv_drm_init(
  {
      int ret = 0;
  #if defined(NV_DRM_AVAILABLE)
--    ret = drm_pci_init(&nv_drm_driver, pci_driver);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+     ret = drm_pci_init(&nv_drm_driver, pci_driver);
++#else
 +    ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#endif
  #endif
      return ret;
  }
-@@ -183,7 +183,7 @@ void nv_drm_exit(
+@@ -183,7 +183,11 @@ void nv_drm_exit(
  )
  {
  #if defined(NV_DRM_AVAILABLE)
--    drm_pci_exit(&nv_drm_driver, pci_driver);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+     drm_pci_exit(&nv_drm_driver, pci_driver);
++#else
 +    drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#endif
  #endif
  }
  
diff --git a/xorg-driver-video-nvidia-legacy-340xx.spec b/xorg-driver-video-nvidia-legacy-340xx.spec
index fa77778..ea08d38 100644
--- a/xorg-driver-video-nvidia-legacy-340xx.spec
+++ b/xorg-driver-video-nvidia-legacy-340xx.spec
@@ -25,7 +25,7 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	1
+%define		rel	2
 %define		pname	xorg-driver-video-nvidia-legacy-340xx
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez