diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:30:23 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:30:23 +0100 |
| commit | 2ecd9abf516e5e4afc482eb0329f9304aed285b4 (patch) | |
| tree | a2980c05f50df82d6d043e4e44ecaf2023220870 /drivers/misc/Kconfig | |
| parent | 698f3e8de2f0104dc80402ea151aae73b946a2d9 (diff) | |
| parent | a04b065c010280ed1806c73cb234a2bf657a5ce9 (diff) | |
| download | kernel_samsung_smdk4412-2ecd9abf516e5e4afc482eb0329f9304aed285b4.zip kernel_samsung_smdk4412-2ecd9abf516e5e4afc482eb0329f9304aed285b4.tar.gz kernel_samsung_smdk4412-2ecd9abf516e5e4afc482eb0329f9304aed285b4.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into replicant-6.0
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 0559caa..1daa392 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -61,27 +61,6 @@ config AD525X_DPOT_SPI To compile this driver as a module, choose M here: the module will be called ad525x_dpot-spi. -config ANDROID_PMEM - bool "Android pmem allocator" - depends on MACH_U1 || MACH_PX || MACH_TRATS - default n - -if ANDROID_PMEM - comment "Reserved memory configurations" - -config ANDROID_PMEM_MEMSIZE_PMEM - int "Memory size in kbytes for android surface using pmem" - default "4096" - -config ANDROID_PMEM_MEMSIZE_PMEM_GPU1 - int "Memory size in kbytes for android surface using pmem_gpu1" - default "10240" - -config ANDROID_PMEM_MEMSIZE_PMEM_CAM - int "Memory size in kbytes for android camera using pmem_camera" - default "4096" -endif - config ATMEL_PWM tristate "Atmel AT32/AT91 PWM support" depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 |