[pkg-nvidia-devel] r602 - in /packages/nvidia-graphics-drivers-legacy-96xx/trunk: conftest.h conftest.sh

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Mon Oct  5 02:21:41 2009
New Revision: 602

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=602
Log:
96.43.11 plus Len patch

Added:
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.sh
Modified:
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.h

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.h?rev=602&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.h (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.h Mon Oct  5 02:21:41 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
@@ -128,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

Added: packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.sh
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.sh?rev=602&op=file
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.sh (added)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/conftest.sh Mon Oct  5 02:21:41 2009
@@ -1,0 +1,7 @@
+#!/bin/sh
+# This is a replacement for nvidia's conftest.sh
+#
+# We have a new conftest.h that works with kbuild that we don't want
+# overwritten or generated or anything else, so we want any call to
+# conftest.sh to do absolutely nothing.
+exit 0