r2060 - in trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8: debian patches

[Sven Luther]

Author: luther
Date: 2004-12-26 05:15:19 -0700 (Sun, 26 Dec 2004)
New Revision: 2060

Removed:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/serial.diff
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/via82cxxx.diff
Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
Log:
Moved the two remaining powerpc patches to the main kernel-source-2.6.8 package/
Built against kernel-source-2.6.8-11.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-12-26 12:00:57 UTC (rev 2059)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/changelog	2004-12-26 12:15:19 UTC (rev 2060)
@@ -1,3 +1,12 @@
+kernel-patch-powerpc-2.6.8 (2.6.8-8) UNRELEASED; urgency=low
+
+  * Moved remaining powerpc patches (pegasos-via-ide and legacy-serial)
+    to the common kernel-source package. (Sven Luther)
+
+  * Rebuilt against kernel-source-2.6.8-11. (Sven Luther)
+
+ -- Sven Luther <luther@debian.org>  Sun, 26 Dec 2004 13:02:57 +0100
+
 kernel-patch-powerpc-2.6.8 (2.6.8-7) unstable; urgency=high
 
   * Rebuilt against kernel-source 2.6.8-10.

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control	2004-12-26 12:00:57 UTC (rev 2059)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control	2004-12-26 12:15:19 UTC (rev 2060)
@@ -1,7 +1,7 @@
 Source: kernel-patch-powerpc-2.6.8
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8 (>= 2.6.8-10), m4
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8 (>= 2.6.8-11), m4
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
 Standards-Version: 3.6.1

Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/serial.diff
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/serial.diff	2004-12-26 12:00:57 UTC (rev 2059)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/serial.diff	2004-12-26 12:15:19 UTC (rev 2060)
@@ -1,40 +0,0 @@
---- 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>
- #include "8250.h"
- 
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+#include <asm/processor.h>
-+#endif
-+
- /*
-  * Configuration:
-  *   share_irqs - whether we pass SA_SHIRQ to request_irq().  This option
-@@ -2026,6 +2030,12 @@ static struct console serial8250_console
- 
- static int __init serial8250_console_init(void)
- {
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+	if(_machine == _MACH_Pmac) {
-+		printk("%s: nothing to do on PowerMac\n",__FUNCTION__);
-+		return -ENODEV;
-+	}
-+#endif
- 	serial8250_isa_init_ports();
- 	register_console(&serial8250_console);
- 	return 0;
-@@ -2175,6 +2185,12 @@ static int __init serial8250_init(void)
- {
- 	int ret, i;
- 
-+#ifdef CONFIG_PPC_MULTIPLATFORM
-+	if(_machine == _MACH_Pmac) {
-+		printk("%s: nothing to do on PowerMac\n",__FUNCTION__);
-+		return -ENODEV;
-+	}
-+#endif
- 	printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ "
- 		"%d ports, IRQ sharing %sabled\n", (int) UART_NR,
- 		share_irqs ? "en" : "dis");
-

Deleted: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/via82cxxx.diff
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/via82cxxx.diff	2004-12-26 12:00:57 UTC (rev 2059)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/patches/via82cxxx.diff	2004-12-26 12:15:19 UTC (rev 2060)
@@ -1,12 +0,0 @@
-diff -urN kernel-source-2.6.5/drivers/ide/pci/via82cxxx.c kernel-source-2.6.5-powerpc/drivers/ide/pci/via82cxxx.c
---- kernel-source-2.6.5/drivers/ide/pci/via82cxxx.c	2004-04-05 12:54:35.000000000 +0200
-+++ kernel-source-2.6.5-powerpc/drivers/ide/pci/via82cxxx.c	2004-04-12 23:43:19.967557824 +0200
-@@ -583,6 +583,8 @@
- 	hwif->tuneproc = &via82cxxx_tune_drive;
- 	hwif->speedproc = &via_set_drive;
- 
-+	hwif->irq = hwif->channel ? 15 : 14;
-+
- 	for (i = 0; i < 2; i++) {
- 		hwif->drives[i].io_32bit = 1;
- 		hwif->drives[i].unmask = (via_config->flags & VIA_NO_UNMASK) ? 0 : 1;