Author: cts Date: Thu Sep 28 18:43:28 2006 New Revision: 7546 Added: dists/trunk/linux-2.6/debian/patches/m68k-fbcon.patch Modified: dists/trunk/linux-2.6/debian/arch/m68k/defines dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches/m68k-no-backlight.patch dists/trunk/linux-2.6/debian/patches/series/2-extra
Log: more m68k update Modified: dists/trunk/linux-2.6/debian/arch/m68k/defines ============================================================================== --- dists/trunk/linux-2.6/debian/arch/m68k/defines (original) +++ dists/trunk/linux-2.6/debian/arch/m68k/defines Thu Sep 28 18:43:28 2006 @@ -5,7 +5,7 @@ # atari # bvme6000 # hp -# mac + mac # mvme147 # mvme16x # q40 Modified: dists/trunk/linux-2.6/debian/changelog ============================================================================== --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Thu Sep 28 18:43:28 2006 @@ -17,9 +17,8 @@ * m68k: Update patches for 2.6.18. * m68k: Re-Add m68k-as and m68k-macro patch which allow building with current binutils. * m68k: disable CONFIG_AUDIT for m68k. - * m68k/mac: add m68k-no-backlight patch. + * m68k/mac: add m68k-no-backlight and m68k-fbcon patch. * m68k/mac: enable SONIC, disable all ADB but CUDA. - * m68k/mac: disable mac, until fbcon.c can be compiled. [ Jurij Smakov ] * Add bugfix/proc-fb-reading.patch to fix the inconsistent behaviour Added: dists/trunk/linux-2.6/debian/patches/m68k-fbcon.patch ============================================================================== --- (empty file) +++ dists/trunk/linux-2.6/debian/patches/m68k-fbcon.patch Thu Sep 28 18:43:28 2006 @@ -0,0 +1,35 @@ +Log message: +fix the survivors of fbcon_vbl_handler() renaming + +Signed-off-by: Al Viro <[EMAIL PROTECTED]> + +Modified files: + linux/drivers/video/console: + fbcon.c + + +Index: linux/drivers/video/console/fbcon.c +Stats: 4 modifications +http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/drivers/video/console/fbcon%2ec.diff?r1=1.1.1.23&r2=1.4 +======================================================================== +--- linux/drivers/video/console/fbcon.c 23 Sep 2006 17:01:53 -0000 1.1.1.23 ++++ linux/drivers/video/console/fbcon.c 27 Sep 2006 23:15:51 -0000 1.4 +@@ -3197,11 +3197,11 @@ + return; + + #ifdef CONFIG_ATARI +- free_irq(IRQ_AUTO_4, fbcon_vbl_handler); ++ free_irq(IRQ_AUTO_4, fb_vbl_handler); + #endif + #ifdef CONFIG_MAC + if (MACH_IS_MAC && vbl_detected) +- free_irq(IRQ_MAC_VBL, fbcon_vbl_handler); ++ free_irq(IRQ_MAC_VBL, fb_vbl_handler); + #endif + + kfree((void *)softback_buf); +- +To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit" in +the body of a message to [EMAIL PROTECTED] +More majordomo info at http://vger.kernel.org/majordomo-info.html + Modified: dists/trunk/linux-2.6/debian/patches/m68k-no-backlight.patch ============================================================================== --- dists/trunk/linux-2.6/debian/patches/m68k-no-backlight.patch (original) +++ dists/trunk/linux-2.6/debian/patches/m68k-no-backlight.patch Thu Sep 28 18:43:28 2006 @@ -1,12 +1,31 @@ ---- linux-2.6-2.6.18/drivers/macintosh/adbhid.c.orig 2006-09-20 05:42:06.000000000 +0200 -+++ linux-2.6-2.6.18/drivers/macintosh/adbhid.c 2006-09-27 22:06:55.000000000 +0200 -@@ -45,7 +45,9 @@ +Log message: +asm/backlight.h is ppc-only + +Signed-off-by: Al Viro <[EMAIL PROTECTED]> + +Modified files: + linux/drivers/macintosh: + adbhid.c + + +Index: linux/drivers/macintosh/adbhid.c +Stats: 1 insertion, 1 deletion +http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/drivers/macintosh/adbhid%2ec.diff?r1=1.1.1.23&r2=1.9 +======================================================================== +--- linux/drivers/macintosh/adbhid.c 23 Sep 2006 16:43:55 -0000 1.1.1.23 ++++ linux/drivers/macintosh/adbhid.c 27 Sep 2006 23:14:35 -0000 1.9 +@@ -45,8 +45,8 @@ #include <linux/pmu.h> #include <asm/machdep.h> -+#ifdef CONFIG_PMAC_BACKLIGHT - #include <asm/backlight.h> -+#endif +-#include <asm/backlight.h> #ifdef CONFIG_PPC_PMAC ++#include <asm/backlight.h> #include <asm/pmac_feature.h> #endif + +- +To unsubscribe from this list: send the line "unsubscribe linux-m68k-cvscommit" in +the body of a message to [EMAIL PROTECTED] +More majordomo info at http://vger.kernel.org/majordomo-info.html + Modified: dists/trunk/linux-2.6/debian/patches/series/2-extra ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/2-extra (original) +++ dists/trunk/linux-2.6/debian/patches/series/2-extra Thu Sep 28 18:43:28 2006 @@ -5,3 +5,4 @@ + m68k-as.patch m68k + m68k-macro.patch m68k + m68k-no-backlight.patch m68k ++ m68k-fbcon.patch m68k _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
