[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/files/

["Emil Karlson" <jekarlson@gmail.com>]

commit:     82f36270ffb88a0addf9bb8638d8922aee353f8b
Author:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Wed Jan 22 21:45:43 2014 +0000
Commit:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Wed Jan 22 21:45:43 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=82f36270

x11-drivers/ati-drivers: patch support for linux-3.13 for legacy branch

Thanks to Helmut Jarausch for providing the patch.

---
 .../files/ati-drivers-kernel-3.8-acpihandle.patch          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
index bdff4fb..145abc7 100644
--- a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
+++ b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch
@@ -1,6 +1,6 @@
---- common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-07-04 21:43:47.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c.new	2012-12-23 11:25:38.000000000 +0100
-@@ -775,11 +775,7 @@
+--- common/lib/modules/fglrx/build_mod/kcl_acpi.c.ORIG	2014-01-21 10:38:08.951838343 +0100
++++ common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-01-21 10:42:25.728845582 +0100
+@@ -775,10 +775,10 @@
  unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
  {
  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
@@ -8,8 +8,10 @@
 -        pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
 -    #else 
 -        pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
--    #endif    
-+    pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
++    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
++        pInfo->video_handle = (acpi_handle)ACPI_HANDLE(&pInfo->pcidev->dev);
++    #else
++        pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev);
+     #endif    
      if ( pInfo->video_handle &&
          (KCL_ACPI_videoDevice(pInfo->video_handle) != KCL_ACPI_OK) )
-     {