diff --git a/config-armv7 b/config-armv7 index b2d9f4f5e..a1df39886 100644 --- a/config-armv7 +++ b/config-armv7 @@ -316,7 +316,7 @@ CONFIG_TI_CPTS=y CONFIG_TI_EMIF=m CONFIG_DRM_TILCDC=m CONFIG_SPI_DAVINCI=m -CONFIG_REGULATOR_TI_ABB=y +CONFIG_REGULATOR_TI_ABB=m CONFIG_TI_PRIV_EDMA=y CONFIG_TI_EDMA=y CONFIG_TI_CPPI41=m @@ -333,7 +333,7 @@ CONFIG_MDIO_SUN4I=m CONFIG_NET_VENDOR_ALLWINNER=y CONFIG_SUN4I_EMAC=m -# imx +# i.MX CONFIG_MXC_IRQ_PRIOR=y # CONFIG_MXC_DEBUG_BOARD is not set CONFIG_SOC_IMX53=y @@ -355,6 +355,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/kernel.spec b/kernel.spec index 815434e21..f5c7f9ec3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2281,6 +2281,9 @@ fi # ||----w | # || || %changelog +* Fri Nov 22 2013 Peter Robinson +- Minor ARM config update + * Wed Nov 20 2013 Josh Boyer - Linux v3.12.1