[kernel] r4881 - in dists/sid/linux-2.6/debian: arch/powerpc patches-debian

[Sven Luther]

Author: luther
Date: Thu Nov 24 12:07:07 2005
New Revision: 4881

Modified:
   dists/sid/linux-2.6/debian/arch/powerpc/config.apus
   dists/sid/linux-2.6/debian/arch/powerpc/defines
   dists/sid/linux-2.6/debian/patches-debian/powerpc-apus.patch
Log:
Fixed some more apus troubles.


Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config.apus	Thu Nov 24 12:07:07 2005
@@ -1076,3 +1076,4 @@
 # CONFIG_HWMON_VID is not set
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_CRYPTO=y
+# CONFIG_SOFTWARE_SUSPEND is not set

Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/defines	Thu Nov 24 12:07:07 2005
@@ -1,5 +1,6 @@
 [base]
 flavours:
+ apus
  powerpc
  powerpc-smp
  powerpc-miboot
@@ -12,10 +13,10 @@
 depends: mkvmlinuz (>= 15)
 
 [powerpc]
-depends: mkvmlinuz (>= 13)
+depends: mkvmlinuz (>= 15)
 
 [powerpc-smp]
-depends: mkvmlinuz (>= 13)
+depends: mkvmlinuz (>= 15)
 
 [powerpc64]
 kernel-arch: ppc64

Modified: dists/sid/linux-2.6/debian/patches-debian/powerpc-apus.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches-debian/powerpc-apus.patch	(original)
+++ dists/sid/linux-2.6/debian/patches-debian/powerpc-apus.patch	Thu Nov 24 12:07:07 2005
@@ -3353,3 +3353,21 @@
  				return -EFAULT;				\
  			data = convsample(data);			\
  			*righth++ = data>>8;				\
+diff -Nur -x.gitignore -xCVS linux-2.6.14/drivers/video/console/fonts.c linux-apus-2.6/drivers/video/console/fonts.c
+--- linux-2.6.14/drivers/video/console/fonts.c	2005-11-24 11:38:51.000000000 +0000
++++ linux-apus-2.6/drivers/video/console/fonts.c	2005-11-24 11:40:02.000000000 +0000
+@@ -118,7 +118,13 @@
+     for(i=0; i<num_fonts; i++) {
+ 	f = fonts[i];
+ 	c = f->pref;
+-#if defined(__mc68000__) || defined(CONFIG_APUS)
++#if defined(CONFIG_APUS)
++#ifdef CONFIG_FONT_PEARL_8x8
++	if (f->idx == PEARL8x8_IDX)
++	    c = 100;
++#endif
++#endif
++#if defined(__mc68000__)
+ #ifdef CONFIG_FONT_PEARL_8x8
+ 	if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
+ 	    c = 100;