summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@android.com>2017-07-28 13:56:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-09-09 17:39:27 +0200
commitffdb5b9e299aa186b2a9620f4b666fcb50a64964 (patch)
treede54b64c6d7a4f859441cc993a18888d65accad8
parent74ffccfed38ff8423d133adecfe859af5534a9d0 (diff)
downloadlinux-stable-ffdb5b9e299aa186b2a9620f4b666fcb50a64964.tar.gz
linux-stable-ffdb5b9e299aa186b2a9620f4b666fcb50a64964.tar.bz2
linux-stable-ffdb5b9e299aa186b2a9620f4b666fcb50a64964.zip
ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.
commit 9e18d0c82f0c07f2a41898d4adbb698a953403ee upstream. These will be required going forward. Signed-off-by: Martijn Coenen <maco@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/android/Kconfig2
-rw-r--r--kernel/configs/android-base.config1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index 832e885349b1..4d4cdc1a6e25 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -22,7 +22,7 @@ config ANDROID_BINDER_IPC
config ANDROID_BINDER_DEVICES
string "Android Binder devices"
depends on ANDROID_BINDER_IPC
- default "binder,hwbinder"
+ default "binder,hwbinder,vndbinder"
---help---
Default value for the binder.devices parameter.
diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index 26a06e09a5bd..0b8ba343b478 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -7,6 +7,7 @@
# CONFIG_SYSVIPC is not set
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ARMV8_DEPRECATED=y
CONFIG_ASHMEM=y