From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Tue, 11 Jan 2011 01:34:51 +0000 (-0800)
Subject: ARM: configs: Add NVMAP_CARVEOUT_KILLER to stingray_defconfig
X-Git-Tag: firefly_0821_release~9834^2~187
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d649a6da869ed928e8f94a4daac2095baeaf71ee;p=firefly-linux-kernel-4.4.55.git

ARM: configs: Add NVMAP_CARVEOUT_KILLER to stingray_defconfig

Change-Id: I745308dd74d45d10bc11dd1f46a0462fa7984ab1
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
---

diff --git a/arch/arm/configs/stingray_defconfig b/arch/arm/configs/stingray_defconfig
index f97fd71337f3..a549299f4d9d 100644
--- a/arch/arm/configs/stingray_defconfig
+++ b/arch/arm/configs/stingray_defconfig
@@ -276,6 +276,7 @@ CONFIG_TEGRA_GRHOST=y
 CONFIG_TEGRA_DC=y
 # CONFIG_NVMAP_ALLOW_SYSMEM is not set
 CONFIG_NVMAP_HIGHMEM_ONLY=y
+CONFIG_NVMAP_CARVEOUT_KILLER=y
 CONFIG_HIDRAW=y
 CONFIG_HID_3M_PCT=y
 CONFIG_HID_A4TECH=y
@@ -317,12 +318,12 @@ CONFIG_HID_WACOM=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_HID_ZYDACRON=y
 CONFIG_USB=y
-CONFIG_USB_ACM=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_TEGRA_HCD=y
+CONFIG_USB_ACM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_MDM6600=y