summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2010-08-31 17:50:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 17:50:15 -0700
commitc34f1951496a0debd89477d088f5f2d664760fbf (patch)
treec3d2bf9e7eb5674073448bd9b6373319c2aa2e8f
parent4358544a3ffde4ffd1e9434b99b2a7179f05cce4 (diff)
parent095a6a6ecb8039067c077db381bd02abc2496422 (diff)
downloadsystem_core-c34f1951496a0debd89477d088f5f2d664760fbf.zip
system_core-c34f1951496a0debd89477d088f5f2d664760fbf.tar.gz
system_core-c34f1951496a0debd89477d088f5f2d664760fbf.tar.bz2
am 095a6a6e: am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
Merge commit '095a6a6ecb8039067c077db381bd02abc2496422' * commit '095a6a6ecb8039067c077db381bd02abc2496422': 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 57d6761..126ba70 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, },