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

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-09-27 08:53:23 +0000 (Sun, 27 Sep 2015)
New Revision: 1519

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/07-4.1.0-build.patch
Log:
* Rewrite patch 07-4.1.0-build.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-09-27 08:53:04 UTC (rev 1518)
+++ fglrx-driver/trunk/debian/changelog	2015-09-27 08:53:23 UTC (rev 1519)
@@ -10,6 +10,7 @@
   * Refresh patch 04-3.17rc6-no_hotplug.
   * Rewrite patch 05-4.0.0-build.
   * Drop merged patch 06-4.0.0-build-2.
+  * Rewrite patch 07-4.1.0-build.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 19 Sep 2015 16:55:28 +0200
 

Modified: fglrx-driver/trunk/debian/patches/07-4.1.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/07-4.1.0-build.patch	2015-09-27 08:53:04 UTC (rev 1518)
+++ fglrx-driver/trunk/debian/patches/07-4.1.0-build.patch	2015-09-27 08:53:23 UTC (rev 1519)
@@ -6,11 +6,10 @@
 Drop the IRQF_DISABLED flag, as it was removed in Linux 4.1
 
 Signed-off-by: Alberto Milone <alberto.milone at canonical.com>
-
-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-09-01 10:00:50.440106425 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-01 10:02:17.519844336 +0200
-@@ -3503,10 +3503,12 @@
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-27 10:45:53.915161112 +0200
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-27 10:51:18.421239216 +0200
+@@ -3511,10 +3511,12 @@
          KCL_PUB_InterruptHandlerWrap,
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
          ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
@@ -24,18 +23,3 @@
  #endif
          dev_name,
          context);
-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-09-01 09:46:47.000000000 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-01 10:02:17.519844336 +0200
-@@ -863,7 +863,11 @@
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-     if(pdev)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)
-        pci_ignore_hotplug(pdev);
-+#else
-+       pdev->ignore_hotplug = 1;
-+#endif
-     }
- #endif
- }