diff options
| -rw-r--r-- | config-armv7 | 4 | ||||
| -rw-r--r-- | config-armv7-generic | 5 | ||||
| -rw-r--r-- | kernel.spec | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/config-armv7 b/config-armv7 index fe04220fe..2ed93b846 100644 --- a/config-armv7 +++ b/config-armv7 @@ -312,10 +312,9 @@ CONFIG_TI_EMIF=m CONFIG_DRM_TILCDC=m CONFIG_SPI_DAVINCI=m CONFIG_SND_DAVINCI_SOC=m -CONFIG_REGULATOR_TI_ABB=y +CONFIG_REGULATOR_TI_ABB=m CONFIG_TI_CPPI41=m CONFIG_MFD_TI_AM335X_TSCADC=m -CONFIG_CHARGER_BQ24190=m CONFIG_TI_ADC081C=m CONFIG_TI_AM335X_ADC=m CONFIG_PWM_TIPWMSS=y @@ -352,6 +351,7 @@ CONFIG_FEC=m CONFIG_KEYBOARD_IMX=m CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_PINCTRL_IMX6SL=y CONFIG_I2C_IMX=m CONFIG_SPI_IMX=m CONFIG_MFD_MC13783=m diff --git a/config-armv7-generic b/config-armv7-generic index 6f9d4bacc..930151a56 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -261,7 +261,6 @@ CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m # CONFIG_GPIO_RCAR is not set CONFIG_W1_MASTER_GPIO=m -CONFIG_CHARGER_GPIO=m # SPI CONFIG_SPI=y @@ -411,6 +410,10 @@ CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_TPS80031=m CONFIG_CHARGER_MANAGER=y +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_BQ24190=m +CONFIG_CHARGER_BQ24735=m +CONFIG_CHARGER_GPIO=m CONFIG_CHARGER_TPS65090=m CONFIG_PDA_POWER=m CONFIG_GENERIC_ADC_BATTERY=m diff --git a/kernel.spec b/kernel.spec index 23cfc578b..655134280 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2210,6 +2210,9 @@ fi # ||----w | # || || %changelog +* Thu Nov 21 2013 Peter Robinson <pbrobinson@fedoraproject.org> +- Some minor ARM config updates + * Thu Nov 21 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git10.1 - Linux v3.12-10928-g527d151 - Drop ACPI blacklist year options and patch (removed with upstream commit 4c47cb197e13 ) |