Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'for-3.6/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/defconfig

From Stephen Warren <swarren@wwwdotorg.org>:

This branch contains a single commit which adjusts tegra_defconfig to
enable new kernel features, driven by new device tree file content and drivers.

* 'for-3.6/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: defconfig updates

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+8 -5
+8 -5
arch/arm/configs/tegra_defconfig
··· 1 1 CONFIG_EXPERIMENTAL=y 2 + CONFIG_NO_HZ=y 3 + CONFIG_HIGH_RES_TIMERS=y 2 4 CONFIG_IKCONFIG=y 3 5 CONFIG_IKCONFIG_PROC=y 4 6 CONFIG_CGROUPS=y ··· 27 25 CONFIG_ARCH_TEGRA_2x_SOC=y 28 26 CONFIG_ARCH_TEGRA_3x_SOC=y 29 27 CONFIG_MACH_HARMONY=y 30 - CONFIG_MACH_KAEN=y 31 28 CONFIG_MACH_PAZ00=y 32 29 CONFIG_MACH_TRIMSLICE=y 33 - CONFIG_MACH_WARIO=y 34 - CONFIG_MACH_VENTANA=y 35 30 CONFIG_TEGRA_EMC_SCALING_ENABLE=y 36 - CONFIG_NO_HZ=y 37 - CONFIG_HIGH_RES_TIMERS=y 38 31 CONFIG_SMP=y 39 32 CONFIG_PREEMPT=y 40 33 CONFIG_AEABI=y ··· 100 103 # CONFIG_HW_RANDOM is not set 101 104 CONFIG_I2C=y 102 105 # CONFIG_I2C_COMPAT is not set 106 + CONFIG_I2C_MUX=y 107 + CONFIG_I2C_MUX_PINCTRL=y 103 108 CONFIG_I2C_TEGRA=y 104 109 CONFIG_SPI=y 105 110 CONFIG_SPI_TEGRA=y 111 + CONFIG_GPIO_TPS65910=y 106 112 CONFIG_POWER_SUPPLY=y 107 113 CONFIG_BATTERY_SBS=y 108 114 CONFIG_SENSORS_LM90=y 109 115 CONFIG_MFD_TPS6586X=y 116 + CONFIG_MFD_TPS65910=y 110 117 CONFIG_REGULATOR=y 111 118 CONFIG_REGULATOR_FIXED_VOLTAGE=y 112 119 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y 113 120 CONFIG_REGULATOR_GPIO=y 114 121 CONFIG_REGULATOR_TPS62360=y 115 122 CONFIG_REGULATOR_TPS6586X=y 123 + CONFIG_REGULATOR_TPS65910=y 116 124 CONFIG_SOUND=y 117 125 CONFIG_SND=y 118 126 # CONFIG_SND_SUPPORT_OLD_API is not set ··· 128 126 # CONFIG_SND_USB is not set 129 127 CONFIG_SND_SOC=y 130 128 CONFIG_SND_SOC_TEGRA=y 129 + CONFIG_SND_SOC_TEGRA_WM8753=y 131 130 CONFIG_SND_SOC_TEGRA_WM8903=y 132 131 CONFIG_SND_SOC_TEGRA_TRIMSLICE=y 133 132 CONFIG_SND_SOC_TEGRA_ALC5632=y