Merge pull request #18 from ARM-software/master

resolving Git auto-merge error.
ARM-software · Jun 1, 2017 · 13ebdd7 · 13ebdd7
2 parents a91c589 + e01b8fe
commit 13ebdd7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/patches/luvos.patch b/patches/luvos.patch
@@ -11564,7 +11564,10 @@ index 0000000..07cb085
 ++		"_STA", NULL, 0, method_test_STA_return, "_STA");
 ++}
 ++
-++	return FWTS_OK;
+++static int sbbr_method_test_UID(fwts_framework *fw)
+++{
+++     return method_evaluate_method(fw, METHOD_MANDATORY,
+++             "_UID", NULL, 0, method_test_UID_return, NULL);
 ++}
 ++
 ++