aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-06-16 13:48:13 -0400
committerStephen Warren <swarren@nvidia.com>2014-06-16 14:02:10 -0400
commit26c9d2e15ce64fa8d47a29cddd8958d7d5f3133a (patch)
tree2507120cdf28c00771537cddc03bbbb7b9982fc7 /arch/arm
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
ARM: tegra: rebuild tegra_defconfig
Run "make tegra_defconfig; make savedefconf" on v3.16-rc1. This allows other people to do the same thing to adjust the defconfig file without their patch bringing in a bunch of irrelevant diffs. All of the removed options either have been removed from Kconfig, or are now default y. Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/tegra_defconfig9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index fb25e2982f64..157a4f144479 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -23,14 +23,11 @@ CONFIG_MODULE_FORCE_UNLOAD=y
23CONFIG_PARTITION_ADVANCED=y 23CONFIG_PARTITION_ADVANCED=y
24# CONFIG_IOSCHED_DEADLINE is not set 24# CONFIG_IOSCHED_DEADLINE is not set
25# CONFIG_IOSCHED_CFQ is not set 25# CONFIG_IOSCHED_CFQ is not set
26CONFIG_GPIO_PCA953X=y
27CONFIG_ARCH_TEGRA=y 26CONFIG_ARCH_TEGRA=y
28CONFIG_ARCH_TEGRA_2x_SOC=y 27CONFIG_ARCH_TEGRA_2x_SOC=y
29CONFIG_ARCH_TEGRA_3x_SOC=y 28CONFIG_ARCH_TEGRA_3x_SOC=y
30CONFIG_ARCH_TEGRA_114_SOC=y 29CONFIG_ARCH_TEGRA_114_SOC=y
31CONFIG_ARCH_TEGRA_124_SOC=y 30CONFIG_ARCH_TEGRA_124_SOC=y
32CONFIG_TEGRA_EMC_SCALING_ENABLE=y
33CONFIG_TRUSTED_FOUNDATIONS=y
34CONFIG_PCI=y 31CONFIG_PCI=y
35CONFIG_PCI_MSI=y 32CONFIG_PCI_MSI=y
36CONFIG_PCI_TEGRA=y 33CONFIG_PCI_TEGRA=y
@@ -74,9 +71,6 @@ CONFIG_IPV6_MIP6=y
74CONFIG_IPV6_TUNNEL=y 71CONFIG_IPV6_TUNNEL=y
75CONFIG_IPV6_MULTIPLE_TABLES=y 72CONFIG_IPV6_MULTIPLE_TABLES=y
76CONFIG_CAN=y 73CONFIG_CAN=y
77CONFIG_CAN_RAW=y
78CONFIG_CAN_BCM=y
79CONFIG_CAN_DEV=y
80CONFIG_CAN_MCP251X=y 74CONFIG_CAN_MCP251X=y
81CONFIG_BT=y 75CONFIG_BT=y
82CONFIG_BT_RFCOMM=y 76CONFIG_BT_RFCOMM=y
@@ -96,7 +90,6 @@ CONFIG_CMA_SIZE_MBYTES=64
96CONFIG_MTD=y 90CONFIG_MTD=y
97CONFIG_MTD_M25P80=y 91CONFIG_MTD_M25P80=y
98CONFIG_MTD_SPI_NOR=y 92CONFIG_MTD_SPI_NOR=y
99CONFIG_PROC_DEVICETREE=y
100CONFIG_BLK_DEV_LOOP=y 93CONFIG_BLK_DEV_LOOP=y
101CONFIG_AD525X_DPOT=y 94CONFIG_AD525X_DPOT=y
102CONFIG_AD525X_DPOT_I2C=y 95CONFIG_AD525X_DPOT_I2C=y
@@ -144,6 +137,7 @@ CONFIG_SPI_TEGRA20_SFLASH=y
144CONFIG_SPI_TEGRA20_SLINK=y 137CONFIG_SPI_TEGRA20_SLINK=y
145CONFIG_PINCTRL_AS3722=y 138CONFIG_PINCTRL_AS3722=y
146CONFIG_PINCTRL_PALMAS=y 139CONFIG_PINCTRL_PALMAS=y
140CONFIG_GPIO_PCA953X=y
147CONFIG_GPIO_PCA953X_IRQ=y 141CONFIG_GPIO_PCA953X_IRQ=y
148CONFIG_GPIO_PALMAS=y 142CONFIG_GPIO_PALMAS=y
149CONFIG_GPIO_TPS6586X=y 143CONFIG_GPIO_TPS6586X=y
@@ -291,5 +285,4 @@ CONFIG_DEBUG_LL=y
291CONFIG_EARLY_PRINTK=y 285CONFIG_EARLY_PRINTK=y
292CONFIG_CRYPTO_TWOFISH=y 286CONFIG_CRYPTO_TWOFISH=y
293# CONFIG_CRYPTO_ANSI_CPRNG is not set 287# CONFIG_CRYPTO_ANSI_CPRNG is not set
294CONFIG_CRYPTO_DEV_TEGRA_AES=y
295CONFIG_CRC_CCITT=y 288CONFIG_CRC_CCITT=y