From ad09f2d857b4c1349b9da3472ec561743e955bc9 Mon Sep 17 00:00:00 2001 From: Cruz Julian Bishop Date: Sat, 22 Dec 2012 09:00:44 +1000 Subject: [PATCH] --- yaml --- r: 353964 b: refs/heads/master c: 0f5afdd2389d983d38030ff95d2a07373a5550fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/binder.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 85ffe9c3ecd3..4b883bd8e2c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94b84e4510f5b625d74e410103d49dfce826a41d +refs/heads/master: 0f5afdd2389d983d38030ff95d2a07373a5550fc diff --git a/trunk/drivers/staging/android/binder.h b/trunk/drivers/staging/android/binder.h index 2f7d195d8b15..76ead8dac265 100644 --- a/trunk/drivers/staging/android/binder.h +++ b/trunk/drivers/staging/android/binder.h @@ -163,7 +163,7 @@ struct binder_pri_ptr_cookie { void *cookie; }; -enum BinderDriverReturnProtocol { +enum binder_driver_return_protocol { BR_ERROR = _IOR('r', 0, int), /* * int: error code @@ -251,7 +251,7 @@ enum BinderDriverReturnProtocol { */ }; -enum BinderDriverCommandProtocol { +enum binder_driver_command_protocol { BC_TRANSACTION = _IOW('c', 0, struct binder_transaction_data), BC_REPLY = _IOW('c', 1, struct binder_transaction_data), /*