summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/tegra_defconfig
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2017-08-17 16:26:14 +0200
committerThierry Reding <treding@nvidia.com>2017-08-17 16:26:14 +0200
commitc616578cc2167b05cdf5d991fd162f7175fb9568 (patch)
tree077eba476b167d0ed6ca26bfd20d6026658e2d75 /arch/arm/configs/tegra_defconfig
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
downloadblackbird-op-linux-c616578cc2167b05cdf5d991fd162f7175fb9568.tar.gz
blackbird-op-linux-c616578cc2167b05cdf5d991fd162f7175fb9568.zip
ARM: tegra: Update default configuration for v4.13-rc1
Regenerate the default configuration on top of v4.13-rc1. This shuffles around a couple of symbols and drops some that have become defaults or which were dropped. Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm/configs/tegra_defconfig')
-rw-r--r--arch/arm/configs/tegra_defconfig7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index f0efc854b5a2..6ed6bad1bc97 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -121,7 +121,6 @@ CONFIG_TOUCHSCREEN_WM97XX=y
CONFIG_TOUCHSCREEN_STMPE=y
CONFIG_INPUT_MISC=y
# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
@@ -247,8 +246,6 @@ CONFIG_RTC_DRV_TEGRA=y
CONFIG_DMADEVICES=y
CONFIG_TEGRA20_APB_DMA=y
CONFIG_STAGING=y
-CONFIG_SENSORS_ISL29018=y
-CONFIG_SENSORS_ISL29028=y
CONFIG_MFD_NVEC=y
CONFIG_KEYBOARD_NVEC=y
CONFIG_SERIO_NVEC_PS2=y
@@ -263,6 +260,8 @@ CONFIG_ARCH_TEGRA_124_SOC=y
CONFIG_MEMORY=y
CONFIG_IIO=y
CONFIG_MPU3050_I2C=y
+CONFIG_SENSORS_ISL29018=y
+CONFIG_SENSORS_ISL29028=y
CONFIG_AK8975=y
CONFIG_PWM=y
CONFIG_PWM_TEGRA=y
@@ -288,13 +287,11 @@ CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ISO8859_1=y
CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_FS=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_SLAB=y
CONFIG_DEBUG_VM=y
CONFIG_DETECT_HUNG_TASK=y
CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_PREEMPT is not set
CONFIG_DEBUG_MUTEXES=y
CONFIG_DEBUG_SG=y
OpenPOWER on IntegriCloud