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

[maximilian attems]

Author: maks-guest
Date: 2005-03-08 22:12:53 +0100 (Tue, 08 Mar 2005)
New Revision: 2655

Added:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers_input_serio_dell_keyboard.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
add dell keyboard fix from 2.6.11.1


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 19:53:02 UTC (rev 2654)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 21:12:53 UTC (rev 2655)
@@ -16,6 +16,8 @@
   * [powerpc] Added new powerbook thermal sensor i2c detection patch
     (Sven Luther)
 
+  * 2.6.11.1 Fix keyboards for Dell machines patch (Maximilian Attems)
+
  -- Sven Luther <luther@debian.org>  Mon,  7 Mar 2005 14:56:32 +0100
 
 kernel-source-2.6.10 (2.6.10-6) UNRELEASED; urgency=low

Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers_input_serio_dell_keyboard.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers_input_serio_dell_keyboard.dpatch	2005-03-08 19:53:02 UTC (rev 2654)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers_input_serio_dell_keyboard.dpatch	2005-03-08 21:12:53 UTC (rev 2655)
@@ -0,0 +1,50 @@
+diff -Naru a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
+--- a/drivers/input/serio/i8042-x86ia64io.h	2005-03-08 13:09:40 -08:00
++++ b/drivers/input/serio/i8042-x86ia64io.h	2005-03-08 13:09:40 -08:00
+@@ -88,7 +88,7 @@
+ };
+ #endif
+ 
+-#ifdef CONFIG_ACPI
++#if defined(__ia64__) && defined(CONFIG_ACPI)
+ #include <linux/acpi.h>
+ #include <acpi/acpi_bus.h>
+ 
+@@ -281,7 +281,7 @@
+ 	i8042_kbd_irq = I8042_MAP_IRQ(1);
+ 	i8042_aux_irq = I8042_MAP_IRQ(12);
+ 
+-#ifdef CONFIG_ACPI
++#if defined(__ia64__) && defined(CONFIG_ACPI)
+ 	if (i8042_acpi_init())
+ 		return -1;
+ #endif
+@@ -300,7 +300,7 @@
+ 
+ static inline void i8042_platform_exit(void)
+ {
+-#ifdef CONFIG_ACPI
++#if defined(__ia64__) && defined(CONFIG_ACPI)
+ 	i8042_acpi_exit();
+ #endif
+ }
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/04 08:12:02-08:00 dtor_core@ameritech.net 
+#   [PATCH] Fix keyboards for Dell machines
+#   
+#   Some ACPI-related changes were recently made to i8042 discovery for ia64.
+#   Unfortunately this broke a significant number of Dell laptops due to their
+#   having incorrect BIOS tables.
+#   
+#   So, for now, arrange for the new code to be ia64-only.
+#   
+#   From: Dmitry Torokhov <dtor_core@ameritech.net>
+#   Signed-off-by: Andrew Morton <akpm@osdl.org>
+#   Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+# 
+# drivers/input/serio/i8042-x86ia64io.h
+#   2005/03/03 13:34:49-08:00 dtor_core@ameritech.net +3 -3
+#   Fix keyboards for Dell machines
+# 

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-08 19:53:02 UTC (rev 2654)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 21:12:53 UTC (rev 2655)
@@ -51,4 +51,4 @@
 + powerpc-therm-adt746x-new-i2c-fix.dpatch
 + powerpc-mv643xx-enet.dpatch
 + powerpc-mv643xx-eth-pegasos.dpatch
-
++ drivers_input_serio_dell_keyboard.dpatch