diff options
| author | Alexandre Courbot <gnurou@gmail.com> | 2013-05-20 13:07:19 -0600 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-20 23:50:34 -0700 |
| commit | 8d9849b05154ff6f19f538c2d094ea0f32981bb0 (patch) | |
| tree | 8d5633bbe47624dd9154ae1ede5fb2e4a2f482cd /arch | |
| parent | b98da4db297bad34a5577df36ff4cb2a8fc90923 (diff) | |
| download | linux-stable-8d9849b05154ff6f19f538c2d094ea0f32981bb0.tar.gz linux-stable-8d9849b05154ff6f19f538c2d094ea0f32981bb0.tar.bz2 linux-stable-8d9849b05154ff6f19f538c2d094ea0f32981bb0.zip | |
ARM: tegra: defconfig fixes
The AK8975 Kconfig option was renamed during the 3.10 merge window.
Adjust tegra_defconfig to enable the new name, so it's not missing
useful features.
Tegra DRM support used to be enabled in the default Tegra configuration,
but it now depends on CONFIG_TEGRA_HOST1X which is disabled by default.
Enable CONFIG_TEGRA_HOST1X so that DRM support is compiled in again.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
[swarren, squashed Alex's and my changes together]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index a5f0485133cf..f7ba316164d4 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -153,6 +153,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_DRM=y +CONFIG_TEGRA_HOST1X=y CONFIG_DRM_TEGRA=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set @@ -202,7 +203,7 @@ CONFIG_TEGRA20_APB_DMA=y CONFIG_STAGING=y CONFIG_SENSORS_ISL29018=y CONFIG_SENSORS_ISL29028=y -CONFIG_SENSORS_AK8975=y +CONFIG_AK8975=y CONFIG_MFD_NVEC=y CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y |