From: Olof Johansson Date: Wed, 21 May 2014 22:07:11 +0000 (-0700) Subject: Merge tag 'tegra-for-3.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~14004^2~46^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1af809f65a39df25531a552584e61a9bd9689d1a;p=mirror_ubuntu-focal-kernel.git Merge tag 'tegra-for-3.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/boards Merge "ARM: tegra: defconfig updates for 3.16" from Stephen Warren: AT24C EEPROM: This is used for the board ID EEPROM on Jetson TK1, as well as likely a whole slew of other NVIDIA reference boards; we simply haven't added enabled the EEPROM in the DT files until now. MTD_SPI_NOR: This defconfig contains the CONFIG_M25P80 symbol, which is now dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to satisfy the new dependency. FRAMEBUFFER_CONSOLE_ROTATION: Needed for devices like Tegra Note 7 and NVIDIA SHIELD to get the boot console in the expected orientation. CAN*, RTC_DRV_DS1307: Toradex Colibri Evaluation Board uses the DS1307 RTC and the MCP251x CAN controller. The NVIDIA Tegra 3 based Colibri T30 module can be used on this carrier board. Furthermore the NVIDIA Tegra 3 based Apalis T30 module too contains two MCP251x CAN controllers. INPUT_JOYDEV: NVIDIA SHIELD embeds a USB joystick device. * tag 'tegra-for-3.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: tegra_defconfig updates Signed-off-by: Olof Johansson --- 1af809f65a39df25531a552584e61a9bd9689d1a