diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 17:42:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 17:42:49 +0100 |
| commit | c4d0a06860b8ade51836f07ae050245f9059c6d6 (patch) | |
| tree | 88931d8ccb3cc94bb2a895149ff18dfc448e3324 /drivers/gpu/ion/Kconfig | |
| parent | ebb7c3b1a10a2cd3986f2db60612d2c6fbb915ab (diff) | |
| parent | 1f76bce8544acd38f7bb1e822540f8ca521e1b7f (diff) | |
Merge remote-tracking branch 'jstultz-android/linaro-fixes/experimental/android-3.9' into merge-androidlsk-android-2013.06
Conflicts:
arch/arm/common/Makefile
arch/arm/include/asm/irq.h
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
Diffstat (limited to 'drivers/gpu/ion/Kconfig')
| -rw-r--r-- | drivers/gpu/ion/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/ion/Kconfig b/drivers/gpu/ion/Kconfig new file mode 100644 index 000000000000..c62f2cbb9e89 --- /dev/null +++ b/drivers/gpu/ion/Kconfig @@ -0,0 +1,14 @@ +menuconfig ION + tristate "Ion Memory Manager" + depends on ARM + select GENERIC_ALLOCATOR + select DMA_SHARED_BUFFER + help + Chose this option to enable the ION Memory Manager. + +config ION_TEGRA + tristate "Ion for Tegra" + depends on ARCH_TEGRA && ION + help + Choose this option if you wish to use ion on an nVidia Tegra. + |