diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2014-06-02 15:58:46 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2014-06-02 15:58:46 +0100 |
| commit | 9954eb4cc6ae7762df48c22b62ba8ae0ca13af0e (patch) | |
| tree | 35b061346fe7218be92ef7d41de45b4da28a5ba1 | |
| parent | d97bd1868822099b229cb37880f79d1d05177507 (diff) | |
| download | kernel-9954eb4cc6ae7762df48c22b62ba8ae0ca13af0e.tar.gz kernel-9954eb4cc6ae7762df48c22b62ba8ae0ca13af0e.tar.xz kernel-9954eb4cc6ae7762df48c22b62ba8ae0ca13af0e.zip | |
Minor ARM MMC config updates
| -rw-r--r-- | config-arm-generic | 1 | ||||
| -rw-r--r-- | config-armv7 | 4 | ||||
| -rw-r--r-- | config-armv7-generic | 3 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/config-arm-generic b/config-arm-generic index 061fc60d1..c1bc6534b 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -4,7 +4,6 @@ CONFIG_COMMON_CLK=y CONFIG_EARLY_PRINTK=y CONFIG_FB_SSD1307=m CONFIG_HW_PERF_EVENTS=y -CONFIG_MMC=y CONFIG_NFS_FS=y CONFIG_CRASH=m diff --git a/config-armv7 b/config-armv7 index 3478efefd..834fe21c9 100644 --- a/config-armv7 +++ b/config-armv7 @@ -145,7 +145,7 @@ CONFIG_USB_OHCI_HCD_OMAP3=m CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_OMAP2PLUS=m CONFIG_OMAP_CONTROL_USB=m -CONFIG_MMC_OMAP=y +CONFIG_MMC_OMAP=m CONFIG_MMC_OMAP_HS=y CONFIG_RTC_DRV_MAX8907=m # CONFIG_RTC_DRV_TWL92330 is not set @@ -592,8 +592,6 @@ CONFIG_DRM_PANEL_S6E8AA0=m CONFIG_CRYPTO_DEV_TEGRA_AES=m -CONFIG_GPIO_PCA953X=m - # OLPC XO CONFIG_SERIO_OLPC_APSP=m diff --git a/config-armv7-generic b/config-armv7-generic index a699de120..ffd7ba0b4 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -161,7 +161,7 @@ CONFIG_SATA_HIGHBANK=m CONFIG_ARM_HIGHBANK_CPUFREQ=m # CONFIG_ARM_HIGHBANK_CPUIDLE is not set -# Allwinner a1x +# Allwinner CONFIG_PINCTRL_SUNXI=y CONFIG_SUNXI_WATCHDOG=m CONFIG_MDIO_SUN4I=m @@ -177,6 +177,7 @@ CONFIG_AHCI_SUNXI=m CONFIG_SPI_SUN4I=m CONFIG_SPI_SUN6I=m CONFIG_MMC_SUNXI=m +CONFIG_GPIO_PCA953X=m CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m diff --git a/kernel.spec b/kernel.spec index 55e9027e8..fbfa73848 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2228,6 +2228,9 @@ fi # ||----w | # || || %changelog +* Mon Jun 2 2014 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM MMC config updates + * Mon Jun 02 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc8.git0.1 - Linux v3.15-rc8 - Disable debugging options. |