[pkg-nvidia-devel] r823 - in /packages/nvidia-graphics-drivers/trunk: conftest.h debian/changelog

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Apr 25 04:22:32 2010
New Revision: 823

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=823
Log:
conftest.h improvements preliminary to update to 195.xx

[ Andreas Beckmann ]
* conftest.h: implement conftest.sh function acpi_walk_namespace (new in
  195.xx), acpi_walk_namespace is available since 2.4.0 (checked with lxr)
* conftest.h: reorder and make INIT_WORK implementation more complete

Modified:
    packages/nvidia-graphics-drivers/trunk/conftest.h
    packages/nvidia-graphics-drivers/trunk/debian/changelog

Modified: packages/nvidia-graphics-drivers/trunk/conftest.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/conftest.h?rev=823&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/conftest.h (original)
+++ packages/nvidia-graphics-drivers/trunk/conftest.h Sun Apr 25 04:22:32 2010
@@ -180,7 +180,7 @@
  #undef NV_ON_EACH_CPU_PRESENT
 #endif
 
-/* Implement conftest.sh function acpi_evaluate_interger */
+/* Implement conftest.sh function acpi_evaluate_integer */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,19)
  #define NV_ACPI_EVALUATE_INTEGER_PRESENT
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
@@ -193,6 +193,16 @@
  typedef unsigned long nv_acpi_integer_t;
 #endif
 
+/* Implement conftest.sh function acpi_walk_namespace */
+/* Only kernels sometime before 2.4.0 don't have this function, and who */
+/* cares anymore */
+#define NV_ACPI_WALK_NAMESPACE_PRESENT
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+ #define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 7
+#else
+ #define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 6
+#endif
+
 /* Implement conftest.sh function ioremap_wc */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
  #define NV_IOREMAP_WC_PRESENT
@@ -207,6 +217,18 @@
  #undef NV_PROC_DIR_ENTRY_HAS_OWNER
 #endif
 
+/* Implement conftest.sh function INIT_WORK */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,41)
+ #define NV_INIT_WORK_PRESENT
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
+  #define NV_INIT_WORK_ARGUMENT_COUNT 2
+ #else
+  #define NV_INIT_WORK_ARGUMENT_COUNT 3
+ #endif
+#else
+ #undef NV_INIT_WORK_PRESENT
+#endif
+
 /* Implement conftest.sh function agp_memory */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
  #define NV_AGP_MEMORY_HAS_PAGES
@@ -227,11 +249,3 @@
 #else
  #undef NV_LINUX_CRED_H_PRESENT
 #endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
- #define NV_INIT_WORK_PRESENT
- #define NV_INIT_WORK_ARGUMENT_COUNT 2
-#else
- #define NV_INIT_WORK_PRESENT
- #define NV_INIT_WORK_ARGUMENT_COUNT 3
-#endif

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=823&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:22:32 2010
@@ -45,6 +45,9 @@
     - add URL_X86 and URL_X86_64, include both URLs in debian/copyright
     - drop unused variables BASE_VERSION, FILENAME, DIRNAME, URL, RELEASE,
       UPSTREAMVERSION, NEXTVER
+  * conftest.h: implement conftest.sh function acpi_walk_namespace (new in
+    195.xx), acpi_walk_namespace is available since 2.4.0 (checked with lxr)
+  * conftest.h: reorder and make INIT_WORK implementation more complete
 
  -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:35:20 -0700