Commit 368c7e57 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-3.19-defconfig' of...

Merge tag 'tegra-for-3.19-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig

Pull "ARM: tegra: Default configuration changes for v3.19" from Thierry Reding:

This is merely a regeneration of the default configuration to get rid of
two symbols that are now enabled by default or removed.

* tag 'tegra-for-3.19-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: tegra: Regenerate default configuration

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b654496a fd1b0f5b
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -97,10 +97,8 @@ CONFIG_ICS932S401=y
CONFIG_APDS9802ALS=y
CONFIG_ISL29003=y
CONFIG_EEPROM_AT24=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_ATA=y
CONFIG_SATA_AHCI=y