Changeset 72cf064 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2012-08-13T17:17:04Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/char/i8042/i8042.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -120 +120 @@
         },
         {
-                .cmd = CMD_BTEST,
+                .cmd = CMD_AND,
                 .value = i8042_OUTPUT_FULL,
                 .srcarg = 1,