diff --git a/config-armv7 b/config-armv7 index 9614857d5..b3a496c46 100644 --- a/config-armv7 +++ b/config-armv7 @@ -51,7 +51,8 @@ CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_SERIAL_8250_OMAP=m -CONFIG_GPIO_OMAP=m +# Needed by omap_hsmmc for card detect on at least the am33xx (BBone) platforms (changed in 4.2) +CONFIG_GPIO_OMAP=y CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m CONFIG_I2C_OMAP=m diff --git a/kernel.spec b/kernel.spec index 53d22d5f6..8d4db9323 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2033,6 +2033,9 @@ fi # # %changelog +* Mon Aug 24 2015 Peter Robinson +- Build in GPIO_OMAP to fix BeagleBone boot on mSD (changes in 4.2 upstream) + * Mon Aug 24 2015 Josh Boyer - 4.2.0-0.rc8.git0.1 - Linux v4.2-rc8