r2600 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches: . series

[Sven Luther]

Author: luther
Date: 2005-03-04 18:26:30 +0100 (Fri, 04 Mar 2005)
New Revision: 2600

Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-serial.dpatch
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
Fixed powerpc-serial.dpatch.


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-serial.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-serial.dpatch	2005-03-04 16:45:09 UTC (rev 2599)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/powerpc-serial.dpatch	2005-03-04 17:26:30 UTC (rev 2600)
@@ -9,10 +9,11 @@
 . $(dirname $0)/DPATCH
 
 @DPATCH@
---- linux-2.6.0-test11.orig/drivers/serial/8250.c	2003-11-26 20:42:55.000000000 +0000
-+++ linux-2.6.0-test11.SuSE/drivers/serial/8250.c	2003-11-29 15:57:50.000000000 +0000
-@@ -43,6 +43,10 @@
- #include <linux/serial_core.h>
+diff -urN kernel-source-2.6.11-2.6.11-orig/drivers/serial/8250.c kernel-source-2.6.11-2.6.11/drivers/serial/8250.c
+--- kernel-source-2.6.11-2.6.11-orig/drivers/serial/8250.c	2005-03-02 08:37:47.000000000 +0100
++++ kernel-source-2.6.11-2.6.11/drivers/serial/8250.c	2005-03-04 18:22:44.297293920 +0100
+@@ -46,6 +46,10 @@
+ 
  #include "8250.h"
  
 +#ifdef CONFIG_PPC_MULTIPLATFORM
@@ -22,7 +23,7 @@
  /*
   * Configuration:
   *   share_irqs - whether we pass SA_SHIRQ to request_irq().  This option
-@@ -2026,6 +2030,12 @@ static struct console serial8250_console
+@@ -2151,6 +2155,12 @@
  
  static int __init serial8250_console_init(void)
  {
@@ -35,7 +36,7 @@
  	serial8250_isa_init_ports();
  	register_console(&serial8250_console);
  	return 0;
-@@ -2175,6 +2185,12 @@ static int __init serial8250_init(void)
+@@ -2482,6 +2492,12 @@
  {
  	int ret, i;
  
@@ -48,4 +49,3 @@
  	printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ "
  		"%d ports, IRQ sharing %sabled\n", (int) UART_NR,
  		share_irqs ? "en" : "dis");
-

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-04 16:45:09 UTC (rev 2599)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-04 17:26:30 UTC (rev 2600)
@@ -1,43 +1,47 @@
-# X drivers/net/acenic_firmware.h
-# X drivers/net/dgrs_firmware.c
-# X drivers/net/tg3.c
-# X drivers/net/tokenring/smctr_firmware.h
-# X drivers/scsi/qla2xxx/ql2100_fw.c
-# X drivers/scsi/qla2xxx/ql2200_fw.c
-# X drivers/scsi/qla2xxx/ql2300_fw.c
-# X drivers/scsi/qla2xxx/ql2322_fw.c
-# X drivers/scsi/qla2xxx/ql6312_fw.c
-# X drivers/scsi/qla2xxx/ql6322_fw.c
-# X drivers/usb/media/dabfirmware.h
-# X drivers/usb/misc/emi62_fw_m.h
-# X drivers/usb/misc/emi62_fw_s.h
-# X drivers/usb/serial/keyspan_mpr_fw.h
-# X drivers/usb/serial/keyspan_usa18x_fw.h
-# X drivers/usb/serial/keyspan_usa19_fw.h
-# X drivers/usb/serial/keyspan_usa19qi_fw.h
-# X drivers/usb/serial/keyspan_usa19qw_fw.h
-# X drivers/usb/serial/keyspan_usa19w_fw.h
-# X drivers/usb/serial/keyspan_usa28_fw.h
-# X drivers/usb/serial/keyspan_usa28x_fw.h
-# X drivers/usb/serial/keyspan_usa28xa_fw.h
-# X drivers/usb/serial/keyspan_usa28xb_fw.h
-# X drivers/usb/serial/keyspan_usa49w_fw.h
-# X drivers/usb/serial/keyspan_usa49wlc_fw.h
-# + doc-post_halloween.dpatch
+X drivers/net/acenic_firmware.h
+X drivers/net/dgrs_firmware.c
+X drivers/net/tg3.c
+X drivers/net/tokenring/smctr_firmware.h
+X drivers/scsi/qla2xxx/ql2100_fw.c
+X drivers/scsi/qla2xxx/ql2200_fw.c
+X drivers/scsi/qla2xxx/ql2300_fw.c
+X drivers/scsi/qla2xxx/ql2322_fw.c
+X drivers/scsi/qla2xxx/ql6312_fw.c
+X drivers/scsi/qla2xxx/ql6322_fw.c
+X drivers/usb/media/dabfirmware.h
+X drivers/usb/misc/emi62_fw_m.h
+X drivers/usb/misc/emi62_fw_s.h
+X drivers/usb/serial/keyspan_mpr_fw.h
+X drivers/usb/serial/keyspan_usa18x_fw.h
+X drivers/usb/serial/keyspan_usa19_fw.h
+X drivers/usb/serial/keyspan_usa19qi_fw.h
+X drivers/usb/serial/keyspan_usa19qw_fw.h
+X drivers/usb/serial/keyspan_usa19w_fw.h
+X drivers/usb/serial/keyspan_usa28_fw.h
+X drivers/usb/serial/keyspan_usa28x_fw.h
+X drivers/usb/serial/keyspan_usa28xa_fw.h
+X drivers/usb/serial/keyspan_usa28xb_fw.h
+X drivers/usb/serial/keyspan_usa49w_fw.h
+X drivers/usb/serial/keyspan_usa49wlc_fw.h
++ doc-post_halloween.dpatch
++ powerpc-fix-power3-ftbfs.dpatch
++ powerpc-serial.dpatch
+# + powerpc-g4-l2-flush-errata.dpatch
+# + fs-asfs.dpatch
+# + modular-ide-pnp.dpatch
+# + modular-ide.dpatch
+# + modular-vesafb.dpatch
+
 # + drivers-ide-dma-blacklist-toshiba.dpatch
 # + drivers-net-8139too-locking.dpatch
 # + drivers-net-tg3-readd.dpatch
 # + drivers-scsi_changer.dpatch
-# + fs-asfs.dpatch
-# + modular-ide-pnp.dpatch
 # + remove-references-to-removed-drivers.dpatch
 # + x86-i486_emu.dpatch
-# + powerpc-g4-l2-flush-errata.dpatch
 # + sparc64-hme-lockup.dpatch
 # + tty-locking-fixes9.dpatch
 # + sparc32-initrd-memcpy.dpatch
 # + drm-locking-fixes.dpatch
-# + powerpc-serial.dpatch
 # + ia64-generic-no-smp.dpatch
 # + ia64-generic-no-smp-1-to-2.dpatch
 # + 029-random_poolsize_overflow.dpatch
@@ -45,15 +49,12 @@
 # + ia64-bte_error-missing-include.dpatch
 # + ia64-irq-affinity-upfix.dpatch
 # + smbfs-overflow-fixes.dpatch
-# + modular-ide.dpatch
 # + drivers-ide-__devinit.dpatch
 # + fix-mxser-compile.dpatch
 # + fix-alpha-ext3-oops.dpatch
-# + modular-vesafb.dpatch
 # + cmsg-compat-signedness-fix-fix.dpatch
 # + scsi-ioctl.dpatch
 # + amd64-ia32-vsyscall-fix.dpatch
-# + powerpc-fix-power3-ftbfs.dpatch
 # + amd64-parse-noexec-fix.dpatch
 # + amd64-int3-fix.dpatch
 # + fbdev-radeon-noaccel.dpatch