Chris Wright <[EMAIL PROTECTED]> wrote:
>
> * Jeff Garzik ([EMAIL PROTECTED]) wrote:
> > Andrew Morton wrote:
> > >Chris Wright <[EMAIL PROTECTED]> wrote:
> > >>Olof's patch is in the linux-release tree, so this brings up a point
> > >>regarding merging. If the quick fix is to be replaced by a better fix
> > >>later (as in this case) there's some room for merge conflict. Does this
> > >>pose a problem for either -mm or Linus' tree?
> > >
> > >It depends who gets to Linus's tree first. If linux-release merges first,
> > >I just revert the temp fix while adding the real fix. But the temp fix
> > >should never have gone into Linus's tree in the first place.
>
> Consider it first patch in fixup series ;-)
Here's the second, and this is much more critical.
And it's untested.
And it's a temp-fix - it'll be addressed by other means in 2.6.12.
What do we do?
From: Dmitry Torokhov <[EMAIL PROTECTED]>
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.
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
25-akpm/drivers/input/serio/i8042-x86ia64io.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/input/serio/i8042-x86ia64io.h~i8042-pnp-workaround
drivers/input/serio/i8042-x86ia64io.h
--- 25/drivers/input/serio/i8042-x86ia64io.h~i8042-pnp-workaround
2005-03-03 13:34:49.000000000 -0800
+++ 25-akpm/drivers/input/serio/i8042-x86ia64io.h 2005-03-03
13:34:49.000000000 -0800
@@ -88,7 +88,7 @@ static struct dmi_system_id __initdata i
};
#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(vo
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(vo
static inline void i8042_platform_exit(void)
{
-#ifdef CONFIG_ACPI
+#if defined(__ia64__) && defined(CONFIG_ACPI)
i8042_acpi_exit();
#endif
}
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
