r3960 - trunk/kernel/source/linux-2.6/debian/patches-debian

[Sven Luther]

Author: luther
Date: 2005-08-17 13:35:36 +0000 (Wed, 17 Aug 2005)
New Revision: 3960

Added:
   trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-pmac-sound-check.patch
Modified:
   trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-apus.patch
Log:
Added powerpc-pmac-sound-check.patch which does some sanity checks.
Fixed apus patch, now only a couple of hunks need checking.


Modified: trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-apus.patch
===================================================================
--- trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-apus.patch	2005-08-17 10:16:56 UTC (rev 3959)
+++ trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-apus.patch	2005-08-17 13:35:36 UTC (rev 3960)
@@ -2736,18 +2736,6 @@
  #include <linux/amifdreg.h>
  #include <linux/amifd.h>
  #include <linux/buffer_head.h>
-diff -Nur -x CVS linux-2.6.12/drivers/net/wan/sdla.c 2.6/drivers/net/wan/sdla.c
---- linux-2.6.12/drivers/net/wan/sdla.c	2005-06-17 21:48:29.000000000 +0200
-+++ 2.6/drivers/net/wan/sdla.c	2005-07-30 23:51:18.000000000 +0200
-@@ -128,7 +128,7 @@
- 
- 		addr += bytes;
- 		temp += bytes;
--		len  -= bic v;
-+		len  -= bytes;
- 	}
- }
- 
 diff -Nur -x CVS linux-2.6.12/include/asm-m68k/bootinfo.h 2.6/include/asm-m68k/bootinfo.h
 --- linux-2.6.12/include/asm-m68k/bootinfo.h	2005-06-17 21:48:29.000000000 +0200
 +++ 2.6/include/asm-m68k/bootinfo.h	2005-07-30 22:49:24.000000000 +0200
@@ -3027,19 +3015,6 @@
  
  extern void *__ioremap(unsigned long address, unsigned long size,
                         unsigned long flags);
-diff -Nur -x CVS linux-2.6.12/include/net/dn_route.h 2.6/include/net/dn_route.h
---- linux-2.6.12/include/net/dn_route.h	2005-06-17 21:48:29.000000000 +0200
-+++ 2.6/include/net/dn_route.h	2004-02-01 00:44:56.000000000 +0100
-@@ -26,8 +26,7 @@
- #define DN_RT_F_PF  0x80 /* Padding Follows                           */
- #define DN_RT_F_VER 0x40 /* Version =0 discard packet if ==1          */
- #define DN_RT_F_IE  0x20 /* Intra Ethernet, Reserved in short pkt     */
--#define DN_RT_F_RTS 0x10 /* Packet is being re        */
--#defi        */
-+#define DN_RT_F_RTS 0x10 /* Packet is being returned to sender        */
- #define DN_RT_F_RQR 0x08 /* Return packet to sender upon non-delivery */
- 
- /* Mask for types of routing packets */
 diff -Nur -x CVS linux-2.6.12/include/video/vga.h 2.6/include/video/vga.h
 --- linux-2.6.12/include/video/vga.h	2005-06-17 21:48:29.000000000 +0200
 +++ 2.6/include/video/vga.h	2005-07-30 20:52:54.000000000 +0200
@@ -3069,17 +3044,3 @@
  #define writew		z_writew
  #endif
  #include <asm/byteorder.h>
-diff -Nur -x CVS linux-2.6.12/Makefile 2.6/Makefile
---- linux-2.6.12/Makefile	2005-06-17 21:48:29.000000000 +0200
-+++ 2.6/Makefile	2005-07-31 03:18:04.000000000 +0200
-@@ -190,8 +190,8 @@
- # Default value for CROSS_COMPILE is not to prefix executables
- # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
- 
--ARCH		?= $(SUBARCH)
--CROSS_COMPILE	?=
-+ARCH		?= ppc
-+CROSS_COMPILE	?= powerpc-linux-
- 
- # Architecture as present in compile.h
- UTS_MACHINE := $(ARCH)

Added: trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-pmac-sound-check.patch
===================================================================
--- trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-pmac-sound-check.patch	2005-08-17 10:16:56 UTC (rev 3959)
+++ trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-pmac-sound-check.patch	2005-08-17 13:35:36 UTC (rev 3960)
@@ -0,0 +1,30 @@
+# Description: checks if ppc_md.feature_call is present before using it.
+# Patch author: David Woodhouse <dwmw2 at infradead.org>
+# Upstream status: submitted.
+
+We shouldn't be assuming that ppc_md.feature_call will be present.
+
+Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
+
+--- linux-2.6.12/sound/ppc/pmac.c.orig	2005-08-17 11:19:46.000000000 +0100
++++ linux-2.6.12/sound/ppc/pmac.c	2005-08-17 11:20:05.000000000 +0100
+@@ -765,7 +765,8 @@ snd_pmac_ctrl_intr(int irq, void *devid,
+  */
+ static void snd_pmac_sound_feature(pmac_t *chip, int enable)
+ {
+-	ppc_md.feature_call(PMAC_FTR_SOUND_CHIP_ENABLE, chip->node, 0, enable);
++	if (ppc_md.feature_call)
++		ppc_md.feature_call(PMAC_FTR_SOUND_CHIP_ENABLE, chip->node, 0, enable);
+ }
+ 
+ /*
+
+-- 
+dwmw2
+
+---------------------------------------------------------------------------------------
+Wanadoo vous informe que cet  e-mail a ete controle par l'anti-virus mail. 
+Aucun virus connu a ce jour par nos services n'a ete detecte.
+
+
+