diff options
| author |   Rebecca Schultz Zavin <rebecca@android.com> | 2013-12-13 19:38:38 -0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-14 08:50:15 -0800 |
| commit | c30707be128e952ca2ba77417cb5509e254a4aac (patch) | |
| tree | f0ba5ba47d721940dffb91d1c51e1252afe937f8 /drivers/staging/android/Kconfig | |
| parent | staging: comedi: ni_at_a2150: fix an always true condition test (diff) | |
| download | linux-dev-c30707be128e952ca2ba77417cb5509e254a4aac.tar.xz linux-dev-c30707be128e952ca2ba77417cb5509e254a4aac.zip | |
gpu: ion: Add ION Memory Manager
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
[jstultz: Squished in Colin Cross' move to staging change,
also disables ION from the build, as it won't compile till
the end of the patchset]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/Kconfig')
| -rw-r--r-- | drivers/staging/android/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index 1e9ab6dfc90d..b91c758883bf 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -100,6 +100,8 @@ config SW_SYNC_USER *WARNING* improper use of this can result in deadlocking kernel drivers from userspace. +source "drivers/staging/android/ion/Kconfig" + endif # if ANDROID endmenu |