From: lxoliva <lxoliva@559672b5-ba27-0410-b829-e8f1faed8b1b>
Date: Mon, 8 Jun 2009 22:33:07 +0000 (+0000)
Subject: Disable DRM_MGA, DRM_R128 and DRM_RADEON, that don't work without
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=37735f193bc59a71a94d1f140b6cec9a209c175e;p=releases.git

Disable DRM_MGA, DRM_R128 and DRM_RADEON, that don't work without
firmware.  At least Radeon works to some extent without the driver or
the firmware.  Indicate e100 is going to proceed without firmware.


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

diff --git a/deblob-2.6.28 b/deblob-2.6.28
index 97f83d4b9e3..2398439bffb 100755
--- a/deblob-2.6.28
+++ b/deblob-2.6.28
@@ -44,7 +44,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.28 extra=2++
+kver=2.6.28 extra=3
 
 fatal () {
   echo "$@"
@@ -420,7 +420,7 @@ clean_mk CONFIG_MOXA_INTELLIO drivers/char/Makefile
 announce DRM_MGA - "Matrox g200/g400"
 clean_blob drivers/gpu/drm/mga/mga_ucode.h
 clean_blob drivers/gpu/drm/mga/mga_warp.c
-clean_kconfig drivers/gpu/drm/Kconfig 'DRM_MGA'
+clean_kconfig -f drivers/gpu/drm/Kconfig 'DRM_MGA'
 clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile
 
 announce DRM_R128 - "ATI Rage 128"
@@ -435,7 +435,7 @@ clean_sed '
   }
 }' drivers/gpu/drm/r128/r128_cce.c 'report missing Free microcode'
 clean_blob drivers/gpu/drm/r128/r128_cce.c
-clean_kconfig drivers/gpu/drm/Kconfig 'DRM_R128'
+clean_kconfig -f drivers/gpu/drm/Kconfig 'DRM_R128'
 clean_mk CONFIG_DRM_R128 drivers/gpu/drm/Makefile
 
 announce DRM_RADEON - "ATI Radeon"
@@ -458,7 +458,7 @@ clean_sed '
 }' drivers/gpu/drm/radeon/radeon_cp.c 'report missing Free microcode on resume'
 clean_blob drivers/gpu/drm/radeon/radeon_cp.c
 clean_blob drivers/gpu/drm/radeon/radeon_microcode.h
-clean_kconfig drivers/gpu/drm/Kconfig 'DRM_RADEON'
+clean_kconfig -f drivers/gpu/drm/Kconfig 'DRM_RADEON'
 clean_mk CONFIG_DRM_RADEON drivers/gpu/drm/Makefile
 
 
@@ -932,8 +932,7 @@ clean_sed '
   /^	for ([^;]*ucode_opts[^{]*) {$/,/^	}$/ {
     /^	}$/ i\
 	}\
-		DPRINTK(DRV, ERR, "Missing Free firmware\\n");\
-		/* ??? We should error out somehow.  */\
+		DPRINTK(DRV, ERR, "Missing Free firmware, proceeding without\\n");\
 		goto noloaducode;
   }
 }