Changeset 86ffa27f in mainline for kernel/generic/include/syscall/syscall.h

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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:

• kernel/generic/include/syscall/syscall.h (modified) (1 diff)

kernel/generic/include/syscall/syscall.h

@@ -94 +94 @@
         SYS_SYSINFO_GET_DATA,
         
-        SYS_DEBUG_ENABLE_CONSOLE,
-        SYS_DEBUG_DISABLE_CONSOLE,
+        SYS_DEBUG_ACTIVATE_CONSOLE,
         
         SYSCALL_END