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-08-23 03:43:23 +0200
commit9e18d0c82f0c07f2a41898d4adbb698a953403ee (patch)
tree518bae80df7fb52b0e9500385f120b10cdc44ba0
parentANDROID: binder: add padding to binder_fd_array_object. (diff)
downloadlinux-9e18d0c82f0c07f2a41898d4adbb698a953403ee.tar.xz
linux-9e18d0c82f0c07f2a41898d4adbb698a953403ee.zip
ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.
These will be required going forward. Signed-off-by: Martijn Coenen <maco@android.com> Cc: stable <stable@vger.kernel.org> # 4.11+ 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 d70829033bb7..d3fd428f4b92 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -10,6 +10,7 @@
# CONFIG_USELIB 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