From 3c049a4a470249318758674b8b80084664a04eb8 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 15 Jul 2011 17:23:40 +0200
Subject: [PATCH] Revert "xf86-video-nvidia: downgrade to
 xf86-video-nvidia-270.41.19"

This reverts commit 5c0839eb464927301530d8fba90258bd59ff6156.
---
 packages/x11/driver/xf86-video-nvidia/meta    |  3 +--
 ...eo-nvidia-270.41.19-linux-3.0_compat.patch | 24 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-270.41.19-linux-3.0_compat.patch

diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta
index 1bf6e4d7c2..c4425ead44 100644
--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@@ -19,8 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-nvidia"
-#PKG_VERSION="280.04"
-PKG_VERSION="270.41.19"
+PKG_VERSION="280.04"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-270.41.19-linux-3.0_compat.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-270.41.19-linux-3.0_compat.patch
deleted file mode 100644
index 6c379edff5..0000000000
--- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-270.41.19-linux-3.0_compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/conftest.sh NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/conftest.sh
---- NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/conftest.sh	2011-05-17 08:32:19.000000000 +0200
-+++ NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/conftest.sh	2011-07-09 18:21:30.602664961 +0200
-@@ -76,7 +76,7 @@
- }
- 
- build_cflags() {
--    BASE_CFLAGS="-D__KERNEL__ \
-+    BASE_CFLAGS="-O2 -D__KERNEL__ \
- -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
- -nostdinc -isystem $ISYSTEM"
- 
-diff -Naur NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/nv-linux.h NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/nv-linux.h
---- NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/nv-linux.h	2011-05-17 08:32:19.000000000 +0200
-+++ NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/nv-linux.h	2011-07-09 18:22:16.317252983 +0200
-@@ -34,6 +34,8 @@
- #  error This driver does not support 2.5 kernels!
- #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0)
- #  define KERNEL_2_6
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
-+#  define KERNEL_2_6
- #else
- #  error This driver does not support development kernels!
- #endif