summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-10-15 13:04:13 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-10-15 13:04:13 +0100
commit492cd8a43582486b3121f112f4176514876861c1 (patch)
treef1065a2fdf410e1beb55ef2973d7b9978aeb473f
parent2abf3ad44c77e8366fc67274fd89f48917eb2414 (diff)
downloadkernel-492cd8a43582486b3121f112f4176514876861c1.tar.gz
kernel-492cd8a43582486b3121f112f4176514876861c1.tar.xz
kernel-492cd8a43582486b3121f112f4176514876861c1.zip
Build in AXP20X_I2C (should fix rhbz 1352140)
-rw-r--r--config-armv7-generic4
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 3 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 b4955dc47..e39ae10f2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2163,6 +2163,9 @@ 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