diff options
author | Stephen Warren <swarren@nvidia.com> | 2014-06-16 13:48:13 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2014-06-16 14:02:10 -0400 |
commit | 26c9d2e15ce64fa8d47a29cddd8958d7d5f3133a (patch) | |
tree | 2507120cdf28c00771537cddc03bbbb7b9982fc7 /arch/arm | |
parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (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_defconfig | 9 |
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 | |||
23 | CONFIG_PARTITION_ADVANCED=y | 23 | CONFIG_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 |
26 | CONFIG_GPIO_PCA953X=y | ||
27 | CONFIG_ARCH_TEGRA=y | 26 | CONFIG_ARCH_TEGRA=y |
28 | CONFIG_ARCH_TEGRA_2x_SOC=y | 27 | CONFIG_ARCH_TEGRA_2x_SOC=y |
29 | CONFIG_ARCH_TEGRA_3x_SOC=y | 28 | CONFIG_ARCH_TEGRA_3x_SOC=y |
30 | CONFIG_ARCH_TEGRA_114_SOC=y | 29 | CONFIG_ARCH_TEGRA_114_SOC=y |
31 | CONFIG_ARCH_TEGRA_124_SOC=y | 30 | CONFIG_ARCH_TEGRA_124_SOC=y |
32 | CONFIG_TEGRA_EMC_SCALING_ENABLE=y | ||
33 | CONFIG_TRUSTED_FOUNDATIONS=y | ||
34 | CONFIG_PCI=y | 31 | CONFIG_PCI=y |
35 | CONFIG_PCI_MSI=y | 32 | CONFIG_PCI_MSI=y |
36 | CONFIG_PCI_TEGRA=y | 33 | CONFIG_PCI_TEGRA=y |
@@ -74,9 +71,6 @@ CONFIG_IPV6_MIP6=y | |||
74 | CONFIG_IPV6_TUNNEL=y | 71 | CONFIG_IPV6_TUNNEL=y |
75 | CONFIG_IPV6_MULTIPLE_TABLES=y | 72 | CONFIG_IPV6_MULTIPLE_TABLES=y |
76 | CONFIG_CAN=y | 73 | CONFIG_CAN=y |
77 | CONFIG_CAN_RAW=y | ||
78 | CONFIG_CAN_BCM=y | ||
79 | CONFIG_CAN_DEV=y | ||
80 | CONFIG_CAN_MCP251X=y | 74 | CONFIG_CAN_MCP251X=y |
81 | CONFIG_BT=y | 75 | CONFIG_BT=y |
82 | CONFIG_BT_RFCOMM=y | 76 | CONFIG_BT_RFCOMM=y |
@@ -96,7 +90,6 @@ CONFIG_CMA_SIZE_MBYTES=64 | |||
96 | CONFIG_MTD=y | 90 | CONFIG_MTD=y |
97 | CONFIG_MTD_M25P80=y | 91 | CONFIG_MTD_M25P80=y |
98 | CONFIG_MTD_SPI_NOR=y | 92 | CONFIG_MTD_SPI_NOR=y |
99 | CONFIG_PROC_DEVICETREE=y | ||
100 | CONFIG_BLK_DEV_LOOP=y | 93 | CONFIG_BLK_DEV_LOOP=y |
101 | CONFIG_AD525X_DPOT=y | 94 | CONFIG_AD525X_DPOT=y |
102 | CONFIG_AD525X_DPOT_I2C=y | 95 | CONFIG_AD525X_DPOT_I2C=y |
@@ -144,6 +137,7 @@ CONFIG_SPI_TEGRA20_SFLASH=y | |||
144 | CONFIG_SPI_TEGRA20_SLINK=y | 137 | CONFIG_SPI_TEGRA20_SLINK=y |
145 | CONFIG_PINCTRL_AS3722=y | 138 | CONFIG_PINCTRL_AS3722=y |
146 | CONFIG_PINCTRL_PALMAS=y | 139 | CONFIG_PINCTRL_PALMAS=y |
140 | CONFIG_GPIO_PCA953X=y | ||
147 | CONFIG_GPIO_PCA953X_IRQ=y | 141 | CONFIG_GPIO_PCA953X_IRQ=y |
148 | CONFIG_GPIO_PALMAS=y | 142 | CONFIG_GPIO_PALMAS=y |
149 | CONFIG_GPIO_TPS6586X=y | 143 | CONFIG_GPIO_TPS6586X=y |
@@ -291,5 +285,4 @@ CONFIG_DEBUG_LL=y | |||
291 | CONFIG_EARLY_PRINTK=y | 285 | CONFIG_EARLY_PRINTK=y |
292 | CONFIG_CRYPTO_TWOFISH=y | 286 | CONFIG_CRYPTO_TWOFISH=y |
293 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 287 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
294 | CONFIG_CRYPTO_DEV_TEGRA_AES=y | ||
295 | CONFIG_CRC_CCITT=y | 288 | CONFIG_CRC_CCITT=y |