diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2022-08-12 15:30:27 +0200 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2024-11-12 13:03:19 +0900 |
| commit | 18825d5de7c818c0708e13a768d44c667578d44a (patch) | |
| tree | 189ad4b181c810d4e4a1a6a842a5b128f5bc47ed | |
| parent | 9c305126dd9775b8768aaadb240cffd29da3130e (diff) | |
| download | linux-rpi-18825d5de7c818c0708e13a768d44c667578d44a.tar.gz linux-rpi-18825d5de7c818c0708e13a768d44c667578d44a.tar.bz2 linux-rpi-18825d5de7c818c0708e13a768d44c667578d44a.zip | |
ANDROID: remove CONFIG_ANDROID dependency for CONFIG_ASHMEM
In commit 1045a06724f3 ("remove CONFIG_ANDROID"), CONFIG_ANDROID is
removed, so fix up the CONFIG_ASHMEM build option to not require it to
be selected and built properly.
Fixes: 1045a06724f3 ("remove CONFIG_ANDROID")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
[sw0312.kim: cherry-pick commit ea7be9d2625c of https://android.googlesource.com/kernel/common/+/refs/heads/android15-6.6 to support waydroid on tizen]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: If9cdf1350949cf98444c20d778d1ca1228a6cd6d
| -rw-r--r-- | drivers/staging/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/android/Kconfig | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index d3dd22db608d..2ec175e5d5a8 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -17,7 +17,7 @@ obj-$(CONFIG_IIO) += iio/ obj-$(CONFIG_FB_SM750) += sm750fb/ obj-$(CONFIG_USB_EMXX) += emxx_udc/ obj-$(CONFIG_MFD_NVEC) += nvec/ -obj-$(CONFIG_ANDROID) += android/ +obj-$(CONFIG_ASHMEM) += android/ obj-$(CONFIG_STAGING_BOARD) += board/ obj-$(CONFIG_LTE_GDM724X) += gdm724x/ obj-$(CONFIG_FB_TFT) += fbtft/ diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index 70498adb1575..36f44131eea7 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -1,8 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 menu "Android" -if ANDROID - config ASHMEM bool "Enable the Anonymous Shared Memory Subsystem" depends on SHMEM @@ -14,6 +12,4 @@ 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. -endif # if ANDROID - endmenu |