summaryrefslogtreecommitdiffstats
path: root/drivers/android
diff options
context:
space:
mode:
authorJisheng Zhang <jszhang@marvell.com>2017-08-25 02:39:51 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-28 10:44:15 +0200
commite8d2ed7db7c3cfbe92923c49cc5e830b0a0ee374 (patch)
tree786066927ba5f92e2b215ac77d5dd0bf898910bd /drivers/android
parentMerge 4.13-rc7 into char-misc-next (diff)
downloadlinux-e8d2ed7db7c3cfbe92923c49cc5e830b0a0ee374.tar.xz
linux-e8d2ed7db7c3cfbe92923c49cc5e830b0a0ee374.zip
Revert "staging: Fix build issues with new binder API"
This reverts commit d0bdff0db809 ("staging: Fix build issues with new binder API"), because commit e38361d032f1 ("ARM: 8091/2: add get_user() support for 8 byte types") has added the 64bit __get_user_asm_* implementation. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/android')
-rw-r--r--drivers/android/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index 4d4cdc1a6e25..8a748d4a4167 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -32,7 +32,7 @@ config ANDROID_BINDER_DEVICES
therefore logically separated from the other devices.
config ANDROID_BINDER_IPC_32BIT
- bool
+ bool "Use old (Android 4.4 and earlier) 32-bit binder API"
depends on !64BIT && ANDROID_BINDER_IPC
default y
---help---