mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[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>
This commit is contained in:
dtor_core@ameritech.net 2005-03-04 08:12:02 -08:00 committed by Greg KH
parent 807235e730
commit 00790c24a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/serio/i8042-x86ia64io.h
View File

@ -88,7 +88,7 @@ static struct dmi_system_id __initdata i8042_dmi_table[] = {
};
#endif
#ifdef CONFIG_ACPI
#if defined(__ia64__) && defined(CONFIG_ACPI)
#include <linux/acpi.h>
#include <acpi/acpi_bus.h>
@ -281,7 +281,7 @@ static inline int i8042_platform_init(void)
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 int i8042_platform_init(void)
static inline void i8042_platform_exit(void)
{
#ifdef CONFIG_ACPI
#if defined(__ia64__) && defined(CONFIG_ACPI)
i8042_acpi_exit();
#endif
}