From c09117ad6effaf5d628812e8c0a8426c096e913e Mon Sep 17 00:00:00 2001
From: David Spencer <idlemoor@slackbuilds.org>
Date: Tue, 10 Jan 2017 00:26:00 +0000
Subject: system/nvidia-kernel: Revert commit c30c401.

This reverts commit c30c401dc08205fdf8b4a8389ae4d6767727f5e3.
Merged in error during public update 20170109.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/nvidia-kernel/README                   |  3 +--
 system/nvidia-kernel/blacklist.conf           |  2 --
 system/nvidia-kernel/nvidia-kernel.SlackBuild |  7 ++-----
 system/nvidia-kernel/nvidia-kernel.info       | 10 +++++-----
 4 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 system/nvidia-kernel/blacklist.conf

(limited to 'system/nvidia-kernel')

diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index ca1bb5be9059..b43764b191bb 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -10,5 +10,4 @@ to make sure that X loads the nvidia module.  If you need to make changes,
 copy that file to /etc/X11/xorg.conf.d/ and edit the copy.  You do not need 
 this file at all if you have a proper and complete xorg.conf.
 
-This package contains a lib/modprobe.d/nouveau.conf file that blacklists
-the conflicting nouveau kernel module.
+The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-kernel/blacklist.conf b/system/nvidia-kernel/blacklist.conf
deleted file mode 100644
index 447f5f71fb73..000000000000
--- a/system/nvidia-kernel/blacklist.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not load the nouveau module since it interferes with the nvidia driver
-blacklist nouveau
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index 1c53f43189a7..5773e98d0bb3 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -28,7 +28,7 @@
 # see nvidia-driver/changelog.txt
 
 PRGNAM=nvidia-kernel
-VERSION=${VERSION:-375.26}
+VERSION=${VERSION:-367.44}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -95,13 +95,10 @@ fi
 # Make sure the X is specified to automagically load the 
 # correct driver, since I always forget. You can remove
 # this file if you have an equivilent entry in /etc/X11/xorg.d
+
 mkdir -p $PKG/usr/share/X11/xorg.conf.d/
 cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
 
-# Blacklist the nouveau kernel module
-mkdir -p $PKG/lib/modprobe.d/
-cat $CWD/blacklist.conf > $PKG/lib/modprobe.d/nouveau.conf
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
 
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index c1d0dd8b6aa3..dc7c23863928 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-kernel"
-VERSION="375.26"
+VERSION="367.44"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/375.26/NVIDIA-Linux-x86-375.26.run"
-MD5SUM="b0706e88ad173f6b9c7bd2e5a838c163"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/375.26/NVIDIA-Linux-x86_64-375.26.run"
-MD5SUM_x86_64="d60819b2e377398c7296999ab5e7c1a4"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/367.44/NVIDIA-Linux-x86-367.44.run"
+MD5SUM="93ff8e1fe32939ca4fd6522b93825edc"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/367.44/NVIDIA-Linux-x86_64-367.44.run"
+MD5SUM_x86_64="d34b42e64b25bf2a8d7b9a157723a3bd"
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
-- 
cgit v1.2.3