[Pkg-fglrx-devel] r1486 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-07-09 17:45:03 +0000 (Thu, 09 Jul 2015)
New Revision: 1486

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch
Log:
- Refresh hunky patch 04-3.17rc6-no_hotplug.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-07-09 17:44:36 UTC (rev 1485)
+++ fglrx-driver/trunk/debian/changelog	2015-07-09 17:45:03 UTC (rev 1486)
@@ -12,6 +12,7 @@
 
   [ Patrick Matthäi ]
   * New upstream release.
+    - Refresh hunky patch 04-3.17rc6-no_hotplug.
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 09 Jul 2015 14:55:04 +0200
 

Modified: fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch	2015-07-09 17:44:36 UTC (rev 1485)
+++ fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch	2015-07-09 17:45:03 UTC (rev 1486)
@@ -1,10 +1,9 @@
 # Fix building with Linux 3.17.
 
-Index: fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
-===================================================================
---- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1093,6 +1093,9 @@ static int fglrx_pci_suspend(struct pci_
+diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-04 16:31:23.000000000 +0200
++++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-09 19:41:44.115360696 +0200
+@@ -1104,6 +1104,9 @@
      // directly here to allow suspend/resume without X server start. 
          firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
          pci_disable_device(pdev);
@@ -14,11 +13,10 @@
          PMSG_EVENT(pdev->dev.power.power_state) = state;
      }
      else
-Index: fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-===================================================================
---- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-@@ -840,10 +840,12 @@ static acpi_status KCL_ACPI_Slot_No_Hotp
+diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-07-04 16:31:23.000000000 +0200
++++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-07-09 19:41:44.115360696 +0200
+@@ -840,10 +840,12 @@
     if(tdev != NULL)
     {
        device = (acpi_device_adr(tdev) >> 16) & 0xffff;