diff --git a/debian/changelog b/debian/changelog index b4b12fac2..4991ee0bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ linux-2.6 (2.6.30~rc1-1~experimental.1) UNRELEASED; urgency=low * 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. diff --git a/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch b/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch new file mode 100644 index 000000000..fca043fd5 --- /dev/null +++ b/debian/patches/debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch @@ -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. + diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index 82b9c7cfc..cd0278b91 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -31,6 +31,8 @@ rm firmware/vicam 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 diff --git a/debian/patches/series/orig-0 b/debian/patches/series/orig-0 index 7ebb2ff20..a4ce7218a 100644 --- a/debian/patches/series/orig-0 +++ b/debian/patches/series/orig-0 @@ -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