diff -Nru psb-kernel-source-4.42.0/debian/changelog psb-kernel-source-4.42.0/debian/changelog --- psb-kernel-source-4.42.0/debian/changelog 2010-11-24 19:16:55.000000000 +0000 +++ psb-kernel-source-4.42.0/debian/changelog 2010-11-25 08:06:47.000000000 +0000 @@ -1,3 +1,9 @@ +psb-kernel-source (4.42.0-0ubuntu2~1010um5) maverick; urgency=low + + * fixed acpi-video.dpatch III + + -- Luca Forina Tue, 25 Nov 2010 14:40:06 +0200 + psb-kernel-source (4.42.0-0ubuntu2~1010um4) maverick; urgency=low * fixed acpi-video.dpatch II diff -Nru psb-kernel-source-4.42.0/debian/patches/00list psb-kernel-source-4.42.0/debian/patches/00list --- psb-kernel-source-4.42.0/debian/patches/00list 2010-11-24 19:20:59.000000000 +0000 +++ psb-kernel-source-4.42.0/debian/patches/00list 2010-11-25 08:11:23.000000000 +0000 @@ -12,5 +12,5 @@ 11_psb-Declare-firmware.dpatch 12_psb-If-not-asking-for-debug-is-an-error-I-want-to-be.dpatch #13_psb-Fix-framebuffer.dpatch already in -acpi-video.dpatch rt-kernel.dpatch +acpi-video.dpatch diff -Nru psb-kernel-source-4.42.0/debian/patches/acpi-video.dpatch psb-kernel-source-4.42.0/debian/patches/acpi-video.dpatch --- psb-kernel-source-4.42.0/debian/patches/acpi-video.dpatch 2010-11-24 19:20:06.000000000 +0000 +++ psb-kernel-source-4.42.0/debian/patches/acpi-video.dpatch 2010-11-25 08:10:59.000000000 +0000 @@ -6,22 +6,20 @@ @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' psb-kernel-source~/psb_drv.c psb-kernel-source/psb_drv.c ---- psb-kernel-source~/psb_drv.c 2010-10-02 12:39:28.000000000 +0200 -+++ psb-kernel-source/psb_drv.c 2010-11-24 20:19:47.400616002 +0100 +--- psb-kernel-source~/psb_drv.c 2010-11-25 09:09:12.941771001 +0100 ++++ psb-kernel-source/psb_drv.c 2010-11-25 09:10:52.729771000 +0100 @@ -34,6 +34,7 @@ #include #include #include +#include - int drm_psb_debug = 0; - EXPORT_SYMBOL(drm_psb_debug); -@@ -264,7 +265,10 @@ - int ret = -ENOMEM; + int psb_drm_psb_debug = 0; + EXPORT_SYMBOL(psb_drm_psb_debug); +@@ -268,6 +269,9 @@ + if (psb_drm_psb_debug) + DRM_ERROR("Debug is 0x%08x\n", psb_drm_psb_debug); - DRM_ERROR("Debug is 0x%08x\n", drm_psb_debug); -- -+ + acpi_video_register(); + DRM_INFO("ACPI Video Interface loaded for brightness keys."); +