Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / android / binder.c

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 95a96a254e5d864a4b72dd01940258013edbe02b..a73596a4f804c817bfd277d3ff51eb42ca969bae 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -150,7 +150,7 @@ static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);
 static int binder_stop_on_user_error;
 
 static int binder_set_stop_on_user_error(const char *val,
-                                        struct kernel_param *kp)
+                                        const struct kernel_param *kp)
 {
        int ret;