diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-17 21:16:17 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-17 21:16:17 +0200 |
| commit | 579d71bc4118eda896cb75ec7944b23630aa9a39 (patch) | |
| tree | e2e77a6e1694e1061c22093c5dedd5448204d989 | |
| parent | d379c118214757e5a42078939ced75a1268994d4 (diff) | |
| parent | 492cd8a43582486b3121f112f4176514876861c1 (diff) | |
| download | kernel-579d71bc4118eda896cb75ec7944b23630aa9a39.tar.gz kernel-579d71bc4118eda896cb75ec7944b23630aa9a39.tar.xz kernel-579d71bc4118eda896cb75ec7944b23630aa9a39.zip | |
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.8.1-300.vanilla.knurd.1.fc24
| -rw-r--r-- | config-armv7-generic | 4 | ||||
| -rw-r--r-- | kernel.spec | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index f1e544ed9..f36ed38b0 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -209,7 +209,7 @@ CONFIG_I2C_SUN6I_P2WI=m CONFIG_GPIO_PCF857X=m CONFIG_TOUCHSCREEN_SUN4I=m CONFIG_MFD_AXP20X=y -CONFIG_MFD_AXP20X_I2C=m +CONFIG_MFD_AXP20X_I2C=y CONFIG_MFD_AXP20X_RSB=m CONFIG_AXP20X_POWER=m CONFIG_INPUT_AXP20X_PEK=m @@ -404,8 +404,6 @@ CONFIG_RTC_DRV_ARMADA38X=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set CONFIG_LEDS_NS2=m -CONFIG_SERIAL_MVEBU_UART=y -# CONFIG_SERIAL_MVEBU_CONSOLE is not set # CONFIG_PCIE_ARMADA_8K is not set # DRM panels diff --git a/kernel.spec b/kernel.spec index f6cead144..f41b39476 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 300 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2183,6 +2183,12 @@ fi # # %changelog +* Sat Oct 15 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Build in AXP20X_I2C (should fix rhbz 1352140) + +* Fri Oct 07 2016 Justin M. Forbes <jforbes@fedoraproject.org> +- update baserelease for Fedora 25 + * Fri Oct 07 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.1-1 - Linux v4.8.1 |