diff options
| author | archshift <admin@archshift.com> | 2014-05-16 23:21:03 -0700 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-05-16 23:21:03 -0700 |
| commit | b8c8d0903ec9be4c7d580464480a0136277be803 (patch) | |
| tree | 9280a9f01e1312d0d8aed493282ae65d2384963c /src/common/log.h | |
| parent | 1e729e7cae237a14067138aaf2b4f5933dba3b36 (diff) | |
| parent | a4fd257469bc06d1474a2e6e8df9dbd233ac79a5 (diff) | |
Merge remote-tracking branch 'upstream/master' into issue-7-fix
Diffstat (limited to 'src/common/log.h')
| -rw-r--r-- | src/common/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/log.h b/src/common/log.h index 02db8bd55..d95f51f56 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -33,7 +33,7 @@ enum LOG_TYPE { EXPANSIONINTERFACE, GDB_STUB, ARM11, - GPFIFO, + GSP, OSHLE, MASTER_LOG, MEMMAP, @@ -54,7 +54,7 @@ enum LOG_TYPE { WII_IPC_FILEIO, WII_IPC_HID, WII_IPC_HLE, - WII_IPC_NET, + SVC, NDMA, HLE, RENDER, |