summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-11-07 12:36:15 +0100
committerThierry Reding <treding@nvidia.com>2014-11-21 10:50:38 +0100
commitfd1b0f5b624d39e6456013fc46aed892f984a1b8 (patch)
treeeadccf9a1fef69c42dcd2d618793aa42ca859005 /arch
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
downloadblackbird-op-linux-fd1b0f5b624d39e6456013fc46aed892f984a1b8.tar.gz
blackbird-op-linux-fd1b0f5b624d39e6456013fc46aed892f984a1b8.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 888fc1521322..40750f93aa83 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -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
OpenPOWER on IntegriCloud