summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/nvidia-drivers/files')
-rw-r--r--x11-drivers/nvidia-drivers/files/09nvidia2
-rw-r--r--x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch30
-rw-r--r--x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch31
-rw-r--r--x11-drivers/nvidia-drivers/files/50nvidia-prelink-blacklist1
-rw-r--r--x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch11
-rw-r--r--x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch13
-rw-r--r--x11-drivers/nvidia-drivers/files/libGL.la-r232
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia40
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-169.0714
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-2.6.38-hardened.diff11
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop8
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff25
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch14
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch92
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch14
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-drivers-275.19-pax-const.patch17
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop7
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-smi.init25
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-udev.sh17
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia.udev-rule6
20 files changed, 0 insertions, 410 deletions
diff --git a/x11-drivers/nvidia-drivers/files/09nvidia b/x11-drivers/nvidia-drivers/files/09nvidia
deleted file mode 100644
index 1fcbef4..0000000
--- a/x11-drivers/nvidia-drivers/files/09nvidia
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has to precede X11's own libraries!
-LDPATH=/opt/nvidia/lib
diff --git a/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch b/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch
deleted file mode 100644
index eff06a5..0000000
--- a/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh
---- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh 2010-02-07 22:53:38.000000000 +0100
-+++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh 2010-02-07 22:57:10.000000000 +0100
-@@ -82,7 +82,7 @@ build_cflags() {
-
- if [ "$OUTPUT" != "$SOURCES" ]; then
- MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
- MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
- fi
-@@ -91,7 +91,7 @@ build_cflags() {
- fi
- else
- MACH_CFLAGS="-I$HEADERS/asm/mach-default"
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
- MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
- fi
-@@ -102,7 +102,7 @@ build_cflags() {
-
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS"
-
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
- fi
- if [ -n "$BUILD_PARAMS" ]; then
diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
deleted file mode 100644
index 401ce95..0000000
--- a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Add support for the 'x86' unified kernel arch in conftest.sh
-
---- NVIDIA-Linux-x86-256.25/kernel/conftest.sh
-+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh
-@@ -101,7 +101,7 @@ build_cflags() {
-
- if [ "$OUTPUT" != "$SOURCES" ]; then
- MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
- MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
- fi
-@@ -110,7 +110,7 @@ build_cflags() {
- fi
- else
- MACH_CFLAGS="-I$HEADERS/asm/mach-default"
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
- MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
- fi
-@@ -121,7 +121,7 @@ build_cflags() {
-
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
- fi
- if [ -n "$BUILD_PARAMS" ]; then
diff --git a/x11-drivers/nvidia-drivers/files/50nvidia-prelink-blacklist b/x11-drivers/nvidia-drivers/files/50nvidia-prelink-blacklist
deleted file mode 100644
index 5e139de..0000000
--- a/x11-drivers/nvidia-drivers/files/50nvidia-prelink-blacklist
+++ /dev/null
@@ -1 +0,0 @@
-PRELINK_PATH_MASK="/usr/lib{,64}/tls/libnvidia-tls*:/usr/lib{,64}/libnvidia*:/usr/lib{,64}/libGL*:/usr/lib{,64}/opengl/nvidia/*:/usr/lib{,64}/OpenCL/vendors/nvidia/*:/usr/lib{,64}/xorg/modules/drivers/nvidia*:/usr/lib{,64}/libvdpau_nvidia*:/usr/lib{,64}/libXvMCNVIDIA*:/usr/lib{,64}/libcuda*:/usr/lib{,64}/libnvcuvid*"
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch
deleted file mode 100644
index da9933f..0000000
--- a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100
-@@ -39,6 +39,7 @@
- typedef XID GLXPixmap;
- typedef XID GLXDrawable;
- typedef XID GLXPbuffer;
-+typedef XID GLXPbufferSGIX;
- typedef XID GLXWindow;
- typedef XID GLXFBConfigID;
-
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch
deleted file mode 100644
index e0393e1..0000000
--- a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000
-+++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000
-@@ -66,6 +66,10 @@
- typedef double GLclampd;
- typedef void GLvoid;
-
-+/* Patching for some better defines in the global system */
-+#ifndef GL_GLEXT_LEGACY
-+#include <GL/glext.h>
-+#endif
-
- /*************************************************************/
-
diff --git a/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/x11-drivers/nvidia-drivers/files/libGL.la-r2
deleted file mode 100644
index 863d184..0000000
--- a/x11-drivers/nvidia-drivers/files/libGL.la-r2
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${PV} libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl'
-
-# Version information for libGL.
-current=${ver1}
-age=${ver2}
-revision=${ver3}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/${libdir}'
diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia
deleted file mode 100644
index 7cf0f7c..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia
+++ /dev/null
@@ -1,40 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more
-# options see /usr/share/doc/PACKAGE/README
-#
-# To enable Side Band Adressing: NVreg_EnableAGPSBA=1
-#
-# To enable Fast Writes: NVreg_EnableAGPFW=1
-#
-# To enable both for instance, uncomment following line:
-#
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
-# If you have a mobile chip, you may need to enable this option
-# if you have hard lockups when starting X.
-#
-# See: Appendix I. Configuring your laptop
-# In /usr/share/doc/PACKAGE/README for full details
-#
-# Choose the appropriate value for NVreg_Mobile from the table:
-# Value Meaning
-# ---------- --------------------------------------------------
-# 0xFFFFFFFF let the kernel module autodetect the correct value
-# 1 Dell laptops
-# 2 non-Compal Toshiba laptops
-# 3 all other laptops
-# 4 Compal Toshiba laptops
-# 5 Gateway laptops
-#
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3
-
-
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07
deleted file mode 100644
index a96b0cd..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-169.07
+++ /dev/null
@@ -1,14 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more
-# options see /usr/share/doc/PACKAGE/README
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-2.6.38-hardened.diff b/x11-drivers/nvidia-drivers/files/nvidia-2.6.38-hardened.diff
deleted file mode 100644
index 8176182..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-2.6.38-hardened.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kernel/nv-linux.h.orig 2010-08-28 05:28:03.000000000 +0200
-+++ kernel/nv-linux.h 2011-05-27 12:47:08.175727041 +0200
-@@ -639,7 +639,7 @@
- #define NV_KMEM_CACHE_CREATE(kmem_cache, name, type) \
- { \
- kmem_cache = kmem_cache_create(name, sizeof(type), \
-- 0, 0, NULL); \
-+ 0, SLAB_USERCOPY, NULL); \
- }
- #else
- #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop b/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop
deleted file mode 100644
index 3878b99..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=sh -c '/opt/bin/nvidia-settings --load-config-only'
-Terminal=false
-Icon=nvidia-settings
-Categories=System;Settings;
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff b/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff
deleted file mode 100644
index 9cfde6a..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur kernel/nv.h kernel/nv.h
---- kernel/nv.h 2012-08-02 18:19:37.000000000 -0700
-+++ kernel/nv.h 2012-08-02 18:19:37.000000000 -0700
-@@ -448,7 +448,20 @@
-
- #define IS_BLACKLISTED_REG_OFFSET(nv, offset, length) \
- ((IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1000, 0x1000, offset, length)) ||\
-- (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x84000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x85000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x86000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x87000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x89000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0xa0000, 0x20000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x104000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x105000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x10a000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c2000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c3000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x618000, 0x2000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x627000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
-
- /* duplicated from nvos.h for external builds */
- #ifndef NVOS_AGP_CONFIG_DISABLE_AGP
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch
deleted file mode 100644
index de93e0b..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-linux/smp_lock.h no longer exists in linux-2.6.39+
-
---- a/usr/src/nv/nv-linux.h
-+++ b/usr/src/nv/nv-linux.h
-@@ -87,7 +87,9 @@
- #if !defined(KERNEL_2_4)
- #include <linux/sched.h> /* suser(), capable() replacement */
- #include <linux/moduleparam.h> /* module_param() */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- #include <linux/smp_lock.h> /* kernel_locked */
-+#endif
- #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */
- #include <asm/kmap_types.h> /* page table entry lookup */
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
deleted file mode 100644
index 75daad3..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: usr/src/nv/conftest.sh
-===================================================================
---- usr/src/nv/conftest.sh
-+++ usr/src/nv/conftest.sh 2010-01-06 12:10:56.000000000 +0530
-@@ -32,14 +32,14 @@
- # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
- # the kernel as a stand-alone kernel.
- #
-- FILE="linux/autoconf.h"
-+ FILE="generated/autoconf.h"
-
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
- #
- # We are looking at a configured source tree; verify
- # that it's not a Xen kernel.
- #
-- echo "#include <linux/autoconf.h>
-+ echo "#include <generated/autoconf.h>
- #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
- #error CONFIG_XEN defined!
- #endif
-@@ -111,7 +111,12 @@
- fi
- }
-
--CONFTEST_PREAMBLE="#include <linux/autoconf.h>
-+CONFTEST_PREAMBLE="#include <linux/version.h>
-+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+ #include <generated/autoconf.h>
-+ #else
-+ #include <linux/autoconf.h>
-+ #endif
- #if defined(CONFIG_XEN) && \
- defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__)
- #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
-@@ -1294,7 +1299,7 @@
- echo "";
- fi
- fi
-- exit $RET
-+# exit $RET
- ;;
-
- get_uname)
-@@ -1316,11 +1321,11 @@
- # tree or at headers shipped for a specific kernel.
- # Determine the kernel version using a compile check.
- #
-- FILE="linux/utsrelease.h"
-+ FILE="generated/utsrelease.h"
-
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
- echo "$CONFTEST_PREAMBLE
-- #include <linux/utsrelease.h>
-+ #include <generated/utsrelease.h>
- int main() {
- printf(\"%s\", UTS_RELEASE);
- return 0;
-@@ -1375,7 +1380,7 @@
- #
- RET=1
- VERBOSE=$6
-- FILE="linux/autoconf.h"
-+ FILE="generated/autoconf.h"
-
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
- #
-@@ -1429,7 +1434,7 @@
- #
- RET=1
- VERBOSE=$6
-- FILE="linux/autoconf.h"
-+ FILE="generated/autoconf.h"
-
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
- #
-Index: usr/src/nv/nvacpi.c
-===================================================================
---- usr/src/nv/nvacpi.c
-+++ usr/src/nv/nvacpi.c 2010-01-06 12:10:56.000000000 +0530
-@@ -49,6 +49,10 @@
- };
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
-+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
-+#endif
-+
- static struct acpi_driver *nv_acpi_driver;
- static acpi_handle nvif_handle = NULL;
- static acpi_handle dsm_handle = NULL;
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
deleted file mode 100644
index a1d3eb8..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-linux/smp_lock.h no longer exists in linux-2.6.39+
-
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -87,7 +87,9 @@
- #if !defined(KERNEL_2_4)
- #include <linux/sched.h> /* suser(), capable() replacement */
- #include <linux/moduleparam.h> /* module_param() */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
- #include <linux/smp_lock.h> /* kernel_locked */
-+#endif
- #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */
- #include <asm/kmap_types.h> /* page table entry lookup */
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-275.19-pax-const.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-275.19-pax-const.patch
deleted file mode 100644
index f3b8259..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-275.19-pax-const.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Binary files kernel.orig/.nv-procfs.c.swp and kernel/.nv-procfs.c.swp differ
-diff -urp kernel.orig/nv-procfs.c kernel/nv-procfs.c
---- kernel.orig/nv-procfs.c 2011-07-13 03:29:30.000000000 +0200
-+++ kernel/nv-procfs.c 2011-07-19 15:45:27.982993911 +0200
-@@ -707,8 +707,10 @@ int nv_register_procfs(void)
- * However, in preparation for this, we need to preserve
- * the procfs read() and write() operations.
- */
-- nv_procfs_registry_fops.read = entry->proc_fops->read;
-- nv_procfs_registry_fops.write = entry->proc_fops->write;
-+ pax_open_kernel();
-+ *(void **)&nv_procfs_registry_fops.read = entry->proc_fops->read;
-+ *(void **)&nv_procfs_registry_fops.write = entry->proc_fops->write;
-+ pax_close_kernel();
-
- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
- nv_procfs_read_registry,
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop b/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop
deleted file mode 100644
index 773a5af..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=/opt/bin/nvidia-settings
-Icon=nvidia-drivers-settings
-Categories=System;Settings;
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-smi.init b/x11-drivers/nvidia-drivers/files/nvidia-smi.init
deleted file mode 100644
index 2cfd4c4..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-smi.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-smi.init,v 1.1 2012/07/22 21:08:43 cardoe Exp $
-
-pidfile="/var/run/nvidia-smi.pid"
-
-depend() {
- after modules
-}
-
-start() {
- ebegin "Starting NVIDIA System Management Interface"
- rm -f ${pidfile}
- start-stop-daemon --start --quiet --pidfile ${pidfile} \
- --make-pidfile --background --exec /opt/bin/nvidia-smi -- \
- -q -l 300
- eend $?
-}
-
-stop() {
- ebegin "Stopping NVIDIA System Management Interface"
- start-stop-daemon --stop --quiet --pidfile ${pidfile}
- eend $?
-}
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-udev.sh b/x11-drivers/nvidia-drivers/files/nvidia-udev.sh
deleted file mode 100644
index 9487b08..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-udev.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 1 ]; then
- echo "Invalid args" >&2
- exit 1
-fi
-
-case $1 in
- add|ADD)
- /opt/bin/nvidia-smi > /dev/null
- ;;
- remove|REMOVE)
- rm -f /dev/nvidia*
- ;;
-esac
-
-exit 0
diff --git a/x11-drivers/nvidia-drivers/files/nvidia.udev-rule b/x11-drivers/nvidia-drivers/files/nvidia.udev-rule
deleted file mode 100644
index 2eb30bb..0000000
--- a/x11-drivers/nvidia-drivers/files/nvidia.udev-rule
+++ /dev/null
@@ -1,6 +0,0 @@
-ACTION=="add", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}"
-# Previously the ACTION was "add|remove" but one user on bug #376527 had a
-# problem until he recompiled udev-171-r5, which is one of the versions I
-# tested with and it was fine. I'm breaking the rules out just to be safe
-# so someone else doesn't have an issue
-ACTION=="remove", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}"