r2136 - trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches

[Dann Frazier]

Author: dannf
Date: 2005-01-06 21:03:15 +0100 (Thu, 06 Jan 2005)
New Revision: 2136

Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp-1-to-2.dpatch
Log:
remove bogus part of patch that reverts an upstreamed UP build fix for sn_console (was drivers-serial-sn_console-up-buildfix.dpatch in 2.6.9)

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp-1-to-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp-1-to-2.dpatch	2005-01-06 18:57:04 UTC (rev 2135)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp-1-to-2.dpatch	2005-01-06 20:03:15 UTC (rev 2136)
@@ -172,24 +172,3 @@
  
  	return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
  }
-diff -urNad linux-source-2.6.10-2.6.10/drivers/serial/sn_console.c /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/drivers/serial/sn_console.c
---- linux-source-2.6.10-2.6.10/drivers/serial/sn_console.c	2004-12-24 22:34:33.000000000 +0100
-+++ /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/drivers/serial/sn_console.c	2004-12-27 11:07:57.234728816 +0100
-@@ -50,7 +50,6 @@
- #include <linux/miscdevice.h>
- #include <linux/serial_core.h>
- 
--#include <asm/io.h>
- #include <asm/sn/simulator.h>
- #include <asm/sn/sn_sal.h>
- 
-@@ -1020,9 +1019,7 @@
- 			spin_unlock_irqrestore(&port->sc_port.lock, flags);
- 
- 			puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
--#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
- 		}
--#endif
- 	}
- 	else {
- 		/* Not yet registered with serial core - simple case */