- fix kernel 4.14 patch

- rel 2

diff --git a/kernel-4.14.patch b/kernel-4.14.patch
index 9aae52c82c2453df8f98660db8009c40272e0b8a..02f2730dec121119025b254ff68b0f6977bf541d 100644 (file)
--- 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-304xx.spec b/xorg-driver-video-nvidia-legacy-304xx.spec
index 2cec35e77ac6af160f4cf63acde66fed62c42ab1..b3bbee19867d1183aca9ff5810ad090517b5ce2c 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-304xx.spec
+++ b/xorg-driver-video-nvidia-legacy-304xx.spec
@@ -25,7 +25,7 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%define                rel     1
+%define                rel     2
 %define                mname   nvidia-legacy-304xx
 %define                pname   xorg-driver-video-%{mname}
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips