From 340d5472eef1cb35f6dd37b86d613f6046db22b8 Mon Sep 17 00:00:00 2001 From: Shridhar Rasal Date: Thu, 1 Mar 2012 11:32:43 +0530 Subject: arm: tegra: enable mmc host test driver bug 930113 Change-Id: I046826f264d0b42bada0de2484146edf2c87c797 Signed-off-by: Shridhar Rasal Reviewed-on: http://git-master/r/86781 Reviewed-by: Simone Willett Tested-by: Simone Willett --- arch/arm/configs/tegra3_android_defconfig | 5 +++-- arch/arm/configs/tegra3_defconfig | 3 +-- arch/arm/configs/tegra_android_defconfig | 1 + arch/arm/configs/tegra_defconfig | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig index 94d3ee59d836..623804aba501 100644 --- a/arch/arm/configs/tegra3_android_defconfig +++ b/arch/arm/configs/tegra3_android_defconfig @@ -69,13 +69,13 @@ CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_NET_KEY=y CONFIG_INET=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y CONFIG_INET_ESP=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set @@ -377,6 +377,7 @@ CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y CONFIG_MMC_BLOCK_MINORS=16 +CONFIG_MMC_TEST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_TEGRA=y diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig index b673e736c989..49ae56a3dcda 100644 --- a/arch/arm/configs/tegra3_defconfig +++ b/arch/arm/configs/tegra3_defconfig @@ -188,7 +188,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=y CONFIG_AD525X_DPOT_I2C=y -# CONFIG_ANDROID_PMEM is not set CONFIG_ICS932S401=y CONFIG_APDS9802ALS=y CONFIG_ISL29003=y @@ -372,6 +371,7 @@ CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y CONFIG_MMC_BLOCK_MINORS=16 +CONFIG_MMC_TEST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_TEGRA=y @@ -436,4 +436,3 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_TEGRA_SE=y -CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index df5cbb8cdf39..527f7508cfb2 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -326,6 +326,7 @@ CONFIG_USB_TEGRA_OTG=y CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y +CONFIG_MMC_TEST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_TEGRA=y diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index fca7f5684221..dc9dc22cbc7c 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -186,9 +186,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=y CONFIG_AD525X_DPOT_I2C=y -# CONFIG_ANDROID_PMEM is not set CONFIG_APDS9802ALS=y -CONFIG_SENSORS_NCT1008=y CONFIG_ISL29003=y CONFIG_SENSORS_AK8975=y CONFIG_SENSORS_NCT1008=y @@ -336,6 +334,7 @@ CONFIG_USB_TEGRA_OTG=y CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y +CONFIG_MMC_TEST=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_TEGRA=y -- cgit v1.2.3