summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-armv73
-rw-r--r--config-armv7-generic5
-rw-r--r--kernel.spec3
3 files changed, 7 insertions, 4 deletions
diff --git a/config-armv7 b/config-armv7
index 3634744d0..489c3f828 100644
--- a/config-armv7
+++ b/config-armv7
@@ -570,7 +570,6 @@ CONFIG_MACH_SUN5I=y
CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_ARCH_TEGRA_3x_SOC=y
CONFIG_TEGRA20_MC=y
-CONFIG_TEGRA30_MC=y
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_SPI_TEGRA20_SFLASH=m
CONFIG_SPI_TEGRA20_SLINK=m
@@ -583,8 +582,6 @@ CONFIG_SND_SOC_TEGRA_WM9712=m
CONFIG_SND_SOC_TEGRA20_AC97=m
CONFIG_SND_SOC_TEGRA20_DAS=m
CONFIG_SND_SOC_TEGRA20_SPDIF=m
-CONFIG_SND_SOC_TEGRA30_AHUB=m
-CONFIG_SND_SOC_TEGRA30_I2S=m
# AC100 (PAZ00)
CONFIG_MFD_NVEC=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 02af5fe0c..8bcf7843b 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -299,8 +299,9 @@ CONFIG_ARCH_TEGRA_124_SOC=y
CONFIG_ARM_TEGRA_CPUFREQ=y
CONFIG_TRUSTED_FOUNDATIONS=y
CONFIG_SERIAL_TEGRA=y
-CONFIG_AHCI_TEGRA=m
+CONFIG_TEGRA30_MC=y
CONFIG_PCI_TEGRA=y
+CONFIG_AHCI_TEGRA=m
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_MMC_SDHCI_TEGRA=m
CONFIG_TEGRA_WATCHDOG=m
@@ -317,6 +318,8 @@ CONFIG_RTC_DRV_TEGRA=m
CONFIG_SND_SOC_TEGRA=m
CONFIG_SND_SOC_TEGRA_MAX98090=m
CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA30_AHUB=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
CONFIG_SND_HDA_TEGRA=m
CONFIG_TEGRA_HOST1X=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
diff --git a/kernel.spec b/kernel.spec
index 03dd29180..d26192596 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2269,6 +2269,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Aug 26 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor tegra updates due to incorrect nvidia kernel config options
+
* Tue Aug 26 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git0.1
- Linux v3.17-rc2
- Fixup ARM MFD options after I2C=y change