revert the previous changes, to reinstall them as a single commit

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@13472 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-check b/deblob-check
index cf61eea9a1dc614717a82cefcbce91edf7e53935..946a4195882f9de20eec1afc9a849ca9e5e76034 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -1,13 +1,13 @@
 #! /bin/sh
 
-# deblob-check version 2017-01-09
+# deblob-check version 2016-12-24
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
 # Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer
 # versions.
 
-# Copyright 2008-2017 Alexandre Oliva <lxoliva@fsfla.org>
+# Copyright 2008-2016 Alexandre Oliva <lxoliva@fsfla.org>
 #
 # This program is part of GNU Linux-libre, a GNU project that
 # publishes scripts to clean up Linux so as to make it suitable for
@@ -4585,10 +4585,6 @@ set_except () {
     # matches, to avoid numerous false positives in sound pcm drivers.
     blobna '["]pcm[45]["]' 'drivers/net/wireless/broadcom/b43\(legacy\)\?\.c'
     blobna '[/][*][ ]What[ ]about[ ][^ \n]*initvals22[?][ ][*][/]' drivers/net/wireless/broadcom/b43.c
-
-    # New in 4.9.2 and 4.8.17.
-    accept '[\t]*fwname[ ]=[ ]["]fuc4\(09\|1a\)[cd]["][;]' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
-    accept '[\t]*snprintf[(]f[,][ ]sizeof[(]f[)][,][ ]["]nouveau[/]nv%02x_%s["][,][ ]device->chipset[,][ ]fwname[)][;][\n][\t]*ret[ ]=[ ]request_firmware[(][&]fw[,][ ]f[,][ ]device->dev[)][;][\n][\t]*if[ ][(]ret[)][ ][{][\n][\t]*snprintf[(]f[,][ ]sizeof[(]f[)][,][ ]["]nouveau[/]%s["][,][ ]fwname[)][;][\n][\t]*ret[ ]=[ ]request_firmware[(][&]fw[,][ ]f[,][ ]device->dev[)][;]' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
    ;;
 
   */*freedo*.patch | */*logo*.patch)