[packages/xorg-driver-video-nvidia] - removed incorrect change in 3.13 patch - rel 3

baggins baggins at pld-linux.org
Sun Feb 9 22:16:01 CET 2014


commit 4e51ad84138aed9554d90c36158432558cafa885
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 9 22:15:45 2014 +0100

    - removed incorrect change in 3.13 patch
    - rel 3

 linux-3.13.patch              | 3 +--
 xorg-driver-video-nvidia.spec | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
---
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
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/4e51ad84138aed9554d90c36158432558cafa885



More information about the pld-cvs-commit mailing list