diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
commit | d25f27034e1e3ca1f86c3e748ce0f565f13bff7f (patch) | |
tree | 9914ad9ce84d779ee83326d109ebed034523ea5e /arch/arm/configs | |
parent | 56db5e2dc402ec8dd7ba922ec5ae1b450ed95d43 (diff) | |
parent | 82685ba23c803d10f678f25e92ca62aa575d24d9 (diff) |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
reverted to current driver supporting ACM rather than CSI2
drivers/media/video/videobuf2-dma-nvmap.c
drivers/video/tegra/host/Makefile
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/tegra3_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/tegra_defconfig | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig index d8ba44fc373e..9f212bbad50b 100644 --- a/arch/arm/configs/tegra3_defconfig +++ b/arch/arm/configs/tegra3_defconfig @@ -226,6 +226,7 @@ CONFIG_DM_UEVENT=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_R8169=y +# CONFIG_R8169_FW_LOAD is not set # CONFIG_NETDEV_10000 is not set CONFIG_BCM4329=m CONFIG_BCM4329_FIRST_SCAN=y @@ -467,3 +468,4 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_TEGRA_SE=y +# CONFIG_INPUT_MOUSEDEV is not set diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index e7b72881f054..6878abd433f6 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -399,3 +399,4 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_TEGRA_AES=y +# CONFIG_INPUT_MOUSEDEV is not set |