From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 9 Feb 2014 21:15:45 +0000 (+0100)
Subject: - removed incorrect change in 3.13 patch
X-Git-Tag: auto/th/xorg-driver-video-nvidia-331.38-3
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=commitdiff_plain;h=4e51ad84138aed9554d90c36158432558cafa885;ds=sidebyside

- removed incorrect change in 3.13 patch
- rel 3
---

diff --git a/linux-3.13.patch b/linux-3.13.patch
index 477ac13..fafe65b 100644
--- a/linux-3.13.patch
+++ b/linux-3.13.patch
@@ -59,8 +59,7 @@ diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
  #ifdef DEVICE_ACPI_HANDLE
      nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); 
--    dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
-+    dev_handle = ACPI_DEVICE_HANDLE(&nvl->dev->dev);
+     dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
  #else
      return RM_ERR_NOT_SUPPORTED;
  #endif
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 8de24bc..5ea474b 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -45,7 +45,7 @@ exit 1
 %define		kpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define		bkpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
-%define		rel 2
+%define		rel 3
 %define		pname	xorg-driver-video-nvidia
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez