Merge branch jb_mr1 into jb_2.6

Merged from from label
AU_LINUX_ANDROID_JB_MR1.04.02.02.049.306

Change-Id: Ie2f7fd3d25f8f28f5d1b6e733974bb5f75999ee8

1 files changed, 4 insertions, 2 deletions

diff --git a/utils/loc_log.h b/utils/loc_log.h
index 8b071a4..abe29b7 100644
--- a/utils/loc_log.h
+++ b/utils/loc_log.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -9,7 +9,7 @@
  *       copyright notice, this list of conditions and the following
  *       disclaimer in the documentation and/or other materials provided
  *       with the distribution.
- *     * Neither the name of Code Aurora Forum, Inc. nor the names of its
+ *     * Neither the name of The Linux Foundation, nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
  *
@@ -36,6 +36,7 @@ extern "C"
 #endif
 
 #include <ctype.h>
+#include "loc_target.h"
 
 typedef struct
 {
@@ -54,6 +55,7 @@ typedef struct
 const char* loc_get_name_from_mask(loc_name_val_s_type table[], int table_size, long mask);
 const char* loc_get_name_from_val(loc_name_val_s_type table[], int table_size, long value);
 const char* loc_get_msg_q_status(int status);
+const char* loc_get_target_name(targetEnumType target);
 
 extern const char* log_succ_fail_string(int is_succ);