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.

1 files changed, 5 insertions, 6 deletions

diff --git a/scripts/deblob-2.6.27 b/scripts/deblob-2.6.27
index 1bd73ad3f..78e66e65d 100755
--- a/scripts/deblob-2.6.27
+++ b/scripts/deblob-2.6.27
@@ -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.27 extra=1++
+kver=2.6.27 extra=2
 
 fatal () {
   echo "$@"
@@ -414,7 +414,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"
@@ -429,7 +429,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"
@@ -452,7 +452,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
 
 
@@ -901,8 +901,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;
   }
 }