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

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Thu Sep  3 23:53:11 2009
New Revision: 597

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=597
Log:
add 2.6.31 conftest.h

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

Modified: packages/nvidia-graphics-drivers/trunk/conftest.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/conftest.h?rev=597&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/conftest.h (original)
+++ packages/nvidia-graphics-drivers/trunk/conftest.h Thu Sep  3 23:53:11 2009
@@ -23,7 +23,7 @@
 
 /* Implement conftest.sh function change_page_attr */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && \
-		LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+               LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
  #ifndef NV_SET_PAGES_UC_PRESENT
   #define NV_CHANGE_PAGE_ATTR_PRESENT
  #endif
@@ -76,9 +76,11 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
  #define NV_I2C_ADAPTER_HAS_INC_USE
  #define NV_I2C_ADAPTER_HAS_DEC_USE
+ #define NV_I2C_ADAPTER_HAS_CLIENT_REGISTER
 #else
  #undef NV_I2C_ADAPTER_HAS_INC_USE
  #undef NV_I2C_ADAPTER_HAS_DEC_USE
+ #undef NV_I2C_ADAPTER_HAS_CLIENT_REGISTER
 #endif
 
 /* Implement conftest.sh function sysctl_max_map_count */
@@ -126,7 +128,7 @@
 
 /* Implement conftest.sh function acpi_device_ops */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) && \
-		LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
+               LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
  #define NV_ACPI_DEVICE_OPS_HAS_MATCH
 #else
  #undef NV_ACPI_DEVICE_OPS_HAS_MATCH
@@ -198,6 +200,20 @@
  #undef NV_IOREMAP_WC_PRESENT
 #endif
 
+/* Implement conftest.sh function proc_dir_entry */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ #define NV_PROC_DIR_ENTRY_HAS_OWNER
+#else
+ #undef NV_PROC_DIR_ENTRY_HAS_OWNER
+#endif
+
+/* Implement conftest.sh function agp_memory */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+ #define NV_AGP_MEMORY_HAS_PAGES
+#else
+ #undef NV_AGP_MEMORY_HAS_PAGES
+#endif
+
 /* Check for linux/semaphore.h */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
  #define NV_LINUX_SEMAPHORE_H_PRESENT

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=597&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Sep  3 23:53:11 2009
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers (185.18.36-2) unstable; urgency=low
+
+  * Add 2.6.31 support in conftest.h (closes: #540663) 
+
+ -- Randall Donald <rdonald at debian.org>  Thu, 03 Sep 2009 16:50:48 -0700
+
 nvidia-graphics-drivers (185.18.36-1) unstable; urgency=low
 
   * New Upstream (closes: #542889, #543155)

Modified: packages/nvidia-graphics-drivers/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright?rev=597&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/copyright (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/copyright Thu Sep  3 23:53:11 2009
@@ -2,7 +2,7 @@
 Mon, 31 Mar 2003 23:40:05 -0800.
 
 It was downloaded from
-ftp://download.nvidia.com/XFree86/Linux-x86_64/185.18.31/NVIDIA-Linux-x86_64-185.18.31-pkg2.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/185.18.36/NVIDIA-Linux-x86_64-185.18.36-pkg2.run
 
 Upstream Author: NVIDIA <linux-bugs at nvidia.com>