Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / arm / configs / tegra_defconfig

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 5aaa32f1fcb68ce8228902c9a8de9bfa952e00ec..3d730a772a2b6f65d6d0447254f4cb01ca94a227 100644 (file)
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -536,6 +536,7 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MG_DISK is not set
 CONFIG_MISC_DEVICES=y
+# CONFIG_ANDROID_PMEM is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_C2PORT is not set