summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2010-08-31 17:47:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 17:47:49 -0700
commit095a6a6ecb8039067c077db381bd02abc2496422 (patch)
treed7c748e65ffe581b314e2653c0b8981bc8104680
parentc1858e5cefbd643737e978cbbca3f264d04d2d1b (diff)
parent739cd9d2d4718913889a15d95c840506a2af04d1 (diff)
downloadsystem_core-095a6a6ecb8039067c077db381bd02abc2496422.zip
system_core-095a6a6ecb8039067c077db381bd02abc2496422.tar.gz
system_core-095a6a6ecb8039067c077db381bd02abc2496422.tar.bz2
am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
Merge commit '739cd9d2d4718913889a15d95c840506a2af04d1' into gingerbread-plus-aosp * commit '739cd9d2d4718913889a15d95c840506a2af04d1': get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
-rw-r--r--include/private/android_filesystem_config.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 903f99f..8acca5a 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -76,7 +76,7 @@ struct android_id_info {
unsigned aid;
};
-static struct android_id_info android_ids[] = {
+static const struct android_id_info android_ids[] = {
{ "root", AID_ROOT, },
{ "system", AID_SYSTEM, },
{ "radio", AID_RADIO, },