aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/android
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-09-02 13:31:45 +0200
committerTakashi Iwai <tiwai@suse.de>2020-09-02 13:32:06 +0200
commit6bde8ef51c917a657476310728d6cb3de6bac9e4 (patch)
treeba8a63abee1fa74d849dc9fc59e0854bc99a8524 /include/uapi/linux/android
parentALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check (diff)
parentALSA: ua101: convert tasklets to use new tasklet_setup() API (diff)
Merge branch 'topic/tasklet-convert' into for-linus
Pull tasklet API conversions. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi/linux/android')
-rw-r--r--include/uapi/linux/android/binder.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h
index 2832134e5397..f1ce2c4c077e 100644
--- a/include/uapi/linux/android/binder.h
+++ b/include/uapi/linux/android/binder.h
@@ -404,7 +404,7 @@ enum binder_driver_return_protocol {
BR_FAILED_REPLY = _IO('r', 17),
/*
- * The the last transaction (either a bcTRANSACTION or
+ * The last transaction (either a bcTRANSACTION or
* a bcATTEMPT_ACQUIRE) failed (e.g. out of memory). No parameters.
*/
};