commit fd1b0f5b624d39e6456013fc46aed892f984a1b8
author Thierry Reding <treding@nvidia.com> Fri Nov 07 12:36:15 2014 +0100
committer Thierry Reding <treding@nvidia.com> Fri Nov 21 10:50:38 2014 +0100
tree eadccf9a1fef69c42dcd2d618793aa42ca859005
parent f114040e3ea6e07372334ade75d1ee0775c355e1

ARM: tegra: Regenerate default configuration

This patch was generated by running 'make tegra_defconfig' followed by
'make savedefconfig' with the v3.18-rc1 tag checked out. Two values go
away: CONFIG_SCSI is selected by CONFIG_ATA and CONFIG_SCSI_MULTI_LUN
was removed.

Signed-off-by: Thierry Reding <treding@nvidia.com>

arch/arm/configs/tegra_defconfig

diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 888fc15..40750f9 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -97,10 +97,8 @@
 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