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/functional/descriptor | |
| 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/functional/descriptor')
| -rw-r--r-- | tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl | 2 | ||||
| -rw-r--r-- | tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl index f46204b90..1d1c8d8f4 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl @@ -1001,5 +1001,5 @@ Method(RT1b,, Serialized) m332(ts, 1, "p444", p442, p441, p444) - CH03(ts, z007, 0x123, 0, 0) + CH03(ts, z007, 0x123, __LINE__, 0) } diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl index f91bac010..99d3396f9 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl @@ -571,5 +571,5 @@ Method(RT18,, Serialized) m331(ts, 3, INT0._SHR, 0x1b, INT1._SHR, 0x63, "_SHR") m331(ts, 4, INT0._INT, 0x28, INT1._INT, 0x70, "_INT") - CH03(ts, z017, 0x123, 0, 0) + CH03(ts, z017, 0x123, __LINE__, 0) } |