X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.31;h=10f95c9904a13ba8cd763e7499db49529493df21;hb=94e29a3619f4e5bbfec010f8b38eb56161deee0b;hp=f2532f5782d66991025fde9e4249f3cd96221e13;hpb=ab3f05f8ec731d2c3c0ed3ec9c086c5a400bcca8;p=releases.git diff --git a/deblob-2.6.31 b/deblob-2.6.31 index f2532f5782d6..10f95c9904a1 100755 --- a/deblob-2.6.31 +++ b/deblob-2.6.31 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2008, 2009 Alexandre Oliva +# Copyright (C) 2008, 2009, 2010 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -45,7 +45,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=2.6.31 extra=2 +kver=2.6.31 extra=3 case $1 in --force) @@ -190,7 +190,7 @@ clean_sed () { filetest $2 || return sed -e "$1" "$2" > "$2".deblob || { die $2: failed: ${3-applied sed script $1} && return 1; } - check_changed $2 && echo $2: ${3-applied sed script $1} + check_changed $2 && echo $2: ${3-applied sed script $1} } reject_firmware () { @@ -1024,7 +1024,7 @@ clean_sed ' /for (p = PhyUcode/i\ printk("%s: missing Free firmware\\n", __func__);\ return (STATUS_FAILURE);\ -#define PhyUcode NULL +#define PhyUcode NULL }' drivers/staging/sxg/sxg.c 'report missing Free firmware' clean_blob drivers/staging/sxg/sxg.c clean_kconfig drivers/staging/sxg/Kconfig 'SXG' @@ -1386,7 +1386,7 @@ clean_sed ' /^INT[ ]set_eFuseLoadFromBin_Proc(/,/^}$/{ /src = kmalloc/i\ printk("%s: missing Free firmware\\n", __func__);\ - return FALSE; + return FALSE; }' drivers/staging/rt2860/common/eeprom.c 'report missing Free firmware' clean_blob drivers/staging/rt2860/common/eeprom.c clean_kconfig drivers/staging/rt2860/Kconfig RT2860 @@ -2001,6 +2001,7 @@ clean_blob Documentation/sound/alsa/ALSA-Configuration.txt clean_blob Documentation/sound/oss/MultiSound clean_blob Documentation/sound/oss/PSS clean_blob Documentation/sound/oss/PSS-updates +clean_blob Documentation/sound/oss/README.OSS clean_file Documentation/dvb/get_dvb_firmware clean_file Documentation/video4linux/extract_xc3028.pl clean_sed s,usb8388,whatever,g drivers/base/Kconfig 'removed blob name'