r2063 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Sven Luther]

Author: luther
Date: 2004-12-26 05:58:42 -0700 (Sun, 26 Dec 2004)
New Revision: 2063

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-pegasos-2.dpatch
Log:
Removed extraneous warning from the dpatch.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-pegasos-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-pegasos-2.dpatch	2004-12-26 12:55:52 UTC (rev 2062)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-pegasos-2.dpatch	2004-12-26 12:58:42 UTC (rev 2063)
@@ -126,7 +126,7 @@
  /*
   * XXX this should be in xmon.h, but putting it there means xmon.h
   * has to include <linux/interrupt.h> (to get irqreturn_t), which
-@@ -214,6 +216,37 @@
+@@ -214,6 +216,36 @@
  	}
  }
  
@@ -135,7 +135,6 @@
 +	struct device_node *root = find_path_device("/");
 +	char *machine;
 +	struct device_node *np;
-+	int l2cr_value;
 +
 +	/* On Pegasos, enable the l2 cache if needed, as the OF forgets it */
 +	if (root == NULL)
@@ -164,7 +163,7 @@
  
  void __init
  chrp_setup_arch(void)
-@@ -236,6 +269,9 @@
+@@ -236,6 +268,9 @@
  	/* Lookup PCI host bridges */
  	chrp_find_bridges();
  
@@ -174,7 +173,7 @@
  #ifndef CONFIG_PPC64BRIDGE
  	/*
  	 *  Temporary fixes for PCI devices.
-@@ -400,16 +436,19 @@
+@@ -400,16 +435,19 @@
  	if (np == NULL)
  		printk(KERN_ERR "Cannot find PCI interrupt acknowledge address\n");
  
@@ -203,7 +202,7 @@
  
  	for (i = 0; i < NUM_8259_INTERRUPTS; i++)
  		irq_desc[i].handler = &i8259_pic;
-@@ -450,6 +489,8 @@
+@@ -450,6 +488,8 @@
  chrp_init(unsigned long r3, unsigned long r4, unsigned long r5,
  	  unsigned long r6, unsigned long r7)
  {
@@ -212,7 +211,7 @@
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* take care of initrd if we have one */
  	if ( r6 )
-@@ -464,12 +505,27 @@
+@@ -464,12 +504,27 @@
  	DMA_MODE_WRITE = 0x48;
  	isa_io_base = CHRP_ISA_IO_BASE;		/* default value */