diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2017-07-21 16:56:48 -0700 |
|---|---|---|
| committer | Erik Schmauss <erik.schmauss@intel.com> | 2017-07-21 17:01:45 -0700 |
| commit | e5bbb5455f7129916678a041d3a17015df13334e (patch) | |
| tree | b0a7f18e569c587fcf0a23e02d0a1de7b609e32f /tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl | |
| parent | be18b4ea0507270d037243c968f510635a331e5a (diff) | |
| download | acpica-e5bbb5455f7129916678a041d3a17015df13334e.tar.gz | |
ASLTS: resolving conflict from rebasing
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Diffstat (limited to 'tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl')
| -rw-r--r-- | tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl index 58e6d952a..1d9eeecf9 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0183/DECL.asl @@ -43,20 +43,20 @@ Method(mf79, 1) Method(mf7a) { - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store("mf79(250):", Debug) Store(mf79(250), Debug) - CH03("", 0, 0x001, 0, 0) + CH03("", 0, 0x001, __LINE__, 0) } Method(m27e) { - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store("mf79(248):", Debug) Store(mf79(248), Debug) - CH03("", 0, 0x003, 0, 0) + CH03("", 0, 0x003, __LINE__, 0) } |