[kernel] r9240 - dists/sid/linux-2.6/debian/patches/bugfix/powerpc

[Martin Michlmayr]

Author: tbm
Date: Tue Jul 31 11:20:29 2007
New Revision: 9240

Log:
adapt patch to 2.6.22


Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/powerpc/i8042-pegasos.patch

Modified: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/i8042-pegasos.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/powerpc/i8042-pegasos.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/i8042-pegasos.patch	Tue Jul 31 11:20:29 2007
@@ -17,13 +17,13 @@
 Signed-off-by: Paul Mackerras <paulus at samba.org>
 ---
 
-diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
-index 4924c48..50ef38c 100644
---- a/arch/powerpc/kernel/setup-common.c
-+++ b/arch/powerpc/kernel/setup-common.c
-@@ -496,6 +496,10 @@ int check_legacy_ioport(unsigned long base_port)
- 			break;
- 		}
+[ adapted to 2.6.22 -- tbm ]
+
+--- a/arch/powerpc/kernel/setup-common.c	2007-07-31 13:19:04.000000000 +0200
++++ b/arch/powerpc/kernel/setup-common.c	2007-07-31 13:19:36.000000000 +0200
+@@ -487,6 +487,10 @@
+ 	switch(base_port) {
+ 	case I8042_DATA_REG:
  		np = of_find_node_by_type(NULL, "8042");
 +		/* Pegasos has no device_type on its 8042 node, look for the
 +		 * name instead */
@@ -32,3 +32,4 @@
  		break;
  	case FDC_BASE: /* FDC1 */
  		np = of_find_node_by_type(NULL, "fdc");
+