[kernel] r13419 - in dists/trunk/linux-2.6/debian: . patches/debian/dfsg patches/series

[Ben Hutchings]

Author: benh
Date: Mon Apr 13 16:34:00 2009
New Revision: 13419

Log:
Remove microcode patches for mgsuvd (not enabled in Debian configs)

Added:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Apr 13 16:21:33 2009	(r13418)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Apr 13 16:34:00 2009	(r13419)
@@ -13,7 +13,7 @@
   * Remove firmware from driver/staging (closes: #521553)
     - make rt2860sta and rt2870sta use request_firmware(),
       thanks to Darren Salt
-  * Remove firmware from enp2611_mod (not included in Debian kernel images)
+  * Remove some sourceless firmware not included in Debian kernel images
 
   [ Martin Michlmayr ]
   * [arm/orion5x] Enable CONFIG_SENSORS_G760A used on the D-Link DNS-323.

Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch	Mon Apr 13 16:34:00 2009	(r13419)
@@ -0,0 +1,24 @@
+diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
+index 48a920a..81570b6 100644
+--- a/arch/powerpc/platforms/8xx/Kconfig
++++ b/arch/powerpc/platforms/8xx/Kconfig
+@@ -160,16 +160,19 @@ config NO_UCODE_PATCH
+ 
+ config USB_SOF_UCODE_PATCH
+ 	bool "USB SOF patch"
++	depends on BROKEN
+ 	help
+ 	  Help not implemented yet, coming soon.
+ 
+ config I2C_SPI_UCODE_PATCH
+ 	bool "I2C/SPI relocation patch"
++	depends on BROKEN
+ 	help
+ 	  Help not implemented yet, coming soon.
+ 
+ config I2C_SPI_SMC1_UCODE_PATCH
+ 	bool "I2C/SPI/SMC1 relocation patch"
++	depends on BROKEN
+ 	help
+ 	  Help not implemented yet, coming soon.
+ 

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Apr 13 16:21:33 2009	(r13418)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Mon Apr 13 16:34:00 2009	(r13419)
@@ -31,6 +31,8 @@
 rm firmware/yam
 rm firmware/yamaha
 
+rm arch/powerpc/sysdev/micropatch.c
+
 rm drivers/gpu/drm/mga/mga_ucode.h
 
 unifdef drivers/gpu/drm/r128/r128_cce.c -UREMOVE_DFSG

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	Mon Apr 13 16:21:33 2009	(r13418)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Mon Apr 13 16:34:00 2009	(r13419)
@@ -1,3 +1,4 @@
++ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
 + debian/dfsg/drivers-gpu-drm-mga-disable.patch
 + debian/dfsg/drivers-gpu-drm-r128-disable.patch
 + debian/dfsg/drivers-gpu-drm-radeon-disable.patch