From 4bac621bdba4c8438524b7078b7eb30eb9cd9222 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 19 Feb 2014 11:51:08 +0200 Subject: [PATCH] xf86-video-nvidia: update to xf86-video-nvidia-331.49 --- packages/x11/driver/xf86-video-nvidia/package.mk | 2 +- .../xf86-video-nvidia-01-kernel-3.13.patch | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-01-kernel-3.13.patch diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 62bea8cb84..ed15db90b7 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xf86-video-nvidia" -PKG_VERSION="331.38" +PKG_VERSION="331.49" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" diff --git a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-01-kernel-3.13.patch b/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-01-kernel-3.13.patch deleted file mode 100644 index ce33d7d4b4..0000000000 --- a/packages/x11/driver/xf86-video-nvidia/patches/xf86-video-nvidia-01-kernel-3.13.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/kernel/nv-acpi.c b/kernel/nv-acpi.c -index b0138cd..756f330 100644 ---- a/kernel/nv-acpi.c -+++ b/kernel/nv-acpi.c -@@ -303,8 +303,11 @@ static int nv_acpi_remove(struct acpi_device *device, int type) - - if (pNvAcpiObject->notify_handler_installed) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) -+/* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */ - NV_ACPI_OS_WAIT_EVENTS_COMPLETE(); - -+#endif - // remove event notifier - status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); - }