diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 22:44:56 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 22:44:56 +0100 |
| commit | 368c7e57ce3bcf331366bd77b5bfccf7827c5453 (patch) | |
| tree | 79fe1f34e93111812eef9d2fccf312f072576b45 /arch/arm/configs | |
| parent | b654496a5419c4a74d698489880bea26ef84720a (diff) | |
| parent | fd1b0f5b624d39e6456013fc46aed892f984a1b8 (diff) | |
| download | blackbird-op-linux-368c7e57ce3bcf331366bd77b5bfccf7827c5453.tar.gz blackbird-op-linux-368c7e57ce3bcf331366bd77b5bfccf7827c5453.zip | |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 2 |
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 |
