Commit b1230d43 authored by Linus Torvalds's avatar Linus Torvalds

Revert the input layer change that assumes the i8042

controller is always in XLATE mode.

That's not true on at least some ppc64 boxes, and we
shouldn't break those just because apparently some
IBM PS/2 model 70 has something strange here.

Cset exclude: vojtech@suse.cz|ChangeSet|20040303141401|00802
parent 7cc543e8
...@@ -721,6 +721,14 @@ static int i8042_controller_init(void) ...@@ -721,6 +721,14 @@ static int i8042_controller_init(void)
printk(KERN_WARNING "i8042.c: Warning: Keylock active.\n"); printk(KERN_WARNING "i8042.c: Warning: Keylock active.\n");
} }
/*
* If the chip is configured into nontranslated mode by the BIOS, don't
* bother enabling translating and be happy.
*/
if (~i8042_ctr & I8042_CTR_XLATE)
i8042_direct = 1;
/* /*
* Set nontranslated mode for the kbd interface if requested by an option. * Set nontranslated mode for the kbd interface if requested by an option.
* After this the kbd interface becomes a simple serial in/out, like the aux * After this the kbd interface becomes a simple serial in/out, like the aux
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment