[pkg-nvidia-devel] r1099 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian: changelog module/debian/patches/AUTOCONF_INCLUDED.patch module/debian/patches/series

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Thu Jun 10 15:31:30 2010
New Revision: 1099

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1099
Log:
fix build with 2.6.33 and newer kernels

Added:
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/AUTOCONF_INCLUDED.patch
Modified:
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog?rev=1099&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog Thu Jun 10 15:31:30 2010
@@ -22,6 +22,8 @@
   * refresh patches
   * update symbols files
   * adjust version numbers in maintainer scripts
+  * new patch AUTOCONF_INCLUDED.patch to fix module build with 2.6.33 and
+    newer kernels (closes: #573326, #585396)
 
  -- Andreas Beckmann <debian at abeckmann.de>  Mon, 07 Jun 2010 13:19:30 +0200
 

Added: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/AUTOCONF_INCLUDED.patch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/AUTOCONF_INCLUDED.patch?rev=1099&op=file
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/AUTOCONF_INCLUDED.patch (added)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/AUTOCONF_INCLUDED.patch Thu Jun 10 15:31:30 2010
@@ -1,0 +1,21 @@
+From: Andreas Beckmann <debian at abeckmann.de>
+Subject: Fix build of 173xx with 2.6.33 and newer kernels
+
+Index: b/nv-linux.h
+===================================================================
+--- a/nv-linux.h	2010-06-10 15:24:01.824037317 +0000
++++ b/nv-linux.h	2010-06-10 15:24:25.120037815 +0000
+@@ -15,11 +15,13 @@
+ #include "nv.h"
+ #include "conftest.h"
+ 
++#ifndef AUTOCONF_INCLUDED
+ #if defined(NV_GENERATED_AUTOCONF_H_PRESENT)
+ #include <generated/autoconf.h>
+ #else
+ #include <linux/autoconf.h>
+ #endif
++#endif
+ 
+ #ifndef LINUX_VERSION_CODE
+ #include <linux/version.h>

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series?rev=1099&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/patches/series Thu Jun 10 15:31:30 2010
@@ -1,2 +1,3 @@
 select-nv-kernel.o.ARCH.patch
 conditionally-include-linux_version.h.patch
+AUTOCONF_INCLUDED.patch