Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ obj-$(CONFIG_THUNDERBOLT) += thunderbolt/
obj-$(CONFIG_CORESIGHT) += hwtracing/coresight/
obj-y += hwtracing/intel_th/
obj-$(CONFIG_STM) += hwtracing/stm/
obj-$(CONFIG_ANDROID) += android/
obj-y += android/
obj-$(CONFIG_NVMEM) += nvmem/
obj-$(CONFIG_FPGA) += fpga/
obj-$(CONFIG_TEE) += tee/
5 changes: 1 addition & 4 deletions drivers/android/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ menu "Android"

config ANDROID
bool "Android Drivers"
default n
---help---
Enable support for various drivers needed on the Android platform

if ANDROID

config ANDROID_BINDER_IPC
bool "Android Binder IPC Driver"
depends on MMU && !M68K
Expand Down Expand Up @@ -41,6 +40,4 @@ config ANDROID_BINDER_IPC_SELFTEST
exhaustively with combinations of various buffer sizes and
alignments.

endif # if ANDROID

endmenu
1 change: 1 addition & 0 deletions drivers/staging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ obj-$(CONFIG_USB_EMXX) += emxx_udc/
obj-$(CONFIG_SPEAKUP) += speakup/
obj-$(CONFIG_MFD_NVEC) += nvec/
obj-$(CONFIG_ANDROID) += android/
obj-$(CONFIG_ASHMEM) += android/
obj-$(CONFIG_SYNC) += android/
obj-$(CONFIG_STAGING_BOARD) += board/
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/android/Kconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
menu "Android"

if ANDROID

config ASHMEM
bool "Enable the Anonymous Shared Memory Subsystem"
default n
Expand All @@ -14,6 +12,8 @@ config ASHMEM
It is, in theory, a good memory allocator for low-memory devices,
because it can discard shared memory units when under memory pressure.

if ANDROID

config ANDROID_LOW_MEMORY_KILLER
bool "Android Low Memory Killer"
---help---
Expand Down