diff --git a/[refs] b/[refs] index 4b883bd8e2c5..7efd9af1fe64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f5afdd2389d983d38030ff95d2a07373a5550fc +refs/heads/master: 167bccbd80b3625af5e7ec04ad4810321c1f300a diff --git a/trunk/drivers/staging/android/binder.c b/trunk/drivers/staging/android/binder.c index 2d12e8a1f82e..538ebe213129 100644 --- a/trunk/drivers/staging/android/binder.c +++ b/trunk/drivers/staging/android/binder.c @@ -3227,7 +3227,7 @@ static void print_binder_proc(struct seq_file *m, m->count = start_pos; } -static const char *binder_return_strings[] = { +static const char * const binder_return_strings[] = { "BR_ERROR", "BR_OK", "BR_TRANSACTION", @@ -3248,7 +3248,7 @@ static const char *binder_return_strings[] = { "BR_FAILED_REPLY" }; -static const char *binder_command_strings[] = { +static const char * const binder_command_strings[] = { "BC_TRANSACTION", "BC_REPLY", "BC_ACQUIRE_RESULT", @@ -3268,7 +3268,7 @@ static const char *binder_command_strings[] = { "BC_DEAD_BINDER_DONE" }; -static const char *binder_objstat_strings[] = { +static const char * const binder_objstat_strings[] = { "proc", "thread", "node",