[Pkg-fglrx-devel] r1196 - fglrx-driver/branches/experimental/debian/patches

[Michael Gilbert]

Author: mgilbert
Date: 2013-04-28 22:38:13 +0000 (Sun, 28 Apr 2013)
New Revision: 1196

Removed:
   fglrx-driver/branches/experimental/debian/patches/04-linux-3.7.diff
   fglrx-driver/branches/experimental/debian/patches/05-linux-3.8.diff
Modified:
   fglrx-driver/branches/experimental/debian/patches/series
Log:
Drop linux 3.7 and 3.8 patches, now supported upstream

Deleted: fglrx-driver/branches/experimental/debian/patches/04-linux-3.7.diff
===================================================================
--- fglrx-driver/branches/experimental/debian/patches/04-linux-3.7.diff	2013-04-28 22:37:56 UTC (rev 1195)
+++ fglrx-driver/branches/experimental/debian/patches/04-linux-3.7.diff	2013-04-28 22:38:13 UTC (rev 1196)
@@ -1,18 +0,0 @@
-# Fix module FTBFS with Linux 3.7. Thanks to Oxan van Leeuwen for this patch.
-# Closes: #697439
-
-diff -Naur fglrx-driver-12.11~beta11.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-12.11~beta11/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-12.11~beta11.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-12-03 03:03:45.000000000 +0100
-+++ fglrx-driver-12.11~beta11/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-01-08 19:03:27.084640738 +0100
-@@ -203,6 +203,11 @@
- #define VM_SHM 0
- #endif
- 
-+// VM_RESERVED is replaced with VM_DONTEXPAND | VM_DONTDUMP in Linux 3.7+
-+#ifndef VM_RESERVED
-+#define VM_RESERVED (VM_DONTEXPAND | VM_DONTDUMP)
-+#endif
-+
- #ifdef FGL_LINUX253P1_VMA_API
- // Linux 2.5.3-pre1 and compatibles
- #define FGL_VMA_API_TYPE        struct vm_area_struct *

Deleted: fglrx-driver/branches/experimental/debian/patches/05-linux-3.8.diff
===================================================================
--- fglrx-driver/branches/experimental/debian/patches/05-linux-3.8.diff	2013-04-28 22:37:56 UTC (rev 1195)
+++ fglrx-driver/branches/experimental/debian/patches/05-linux-3.8.diff	2013-04-28 22:38:13 UTC (rev 1196)
@@ -1,16 +0,0 @@
-# Patch from Alberto Milone <alberto.milone at canonical.com> to add Linux 3.8 support.
-
-diff -Naur fglrx-driver-13.1.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-13.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- fglrx-driver-13.1.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-01-15 16:42:53.000000000 +0100
-+++ fglrx-driver-13.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-01-19 14:22:01.075952886 +0100
-@@ -775,7 +775,9 @@
- unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
- {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
--    #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-+        pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
-+    #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
-         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
-     #else 
-         pInfo->video_handle = pInfo->pcidev->dev.firmware_data;

Modified: fglrx-driver/branches/experimental/debian/patches/series
===================================================================
--- fglrx-driver/branches/experimental/debian/patches/series	2013-04-28 22:37:56 UTC (rev 1195)
+++ fglrx-driver/branches/experimental/debian/patches/series	2013-04-28 22:38:13 UTC (rev 1196)
@@ -1,5 +1,3 @@
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
-04-linux-3.7.diff
-05-linux-3.8.diff
 06-stub-for-agpless-kernel.diff