summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-21 09:05:07 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-21 09:05:07 -0400
commit96ebb7b6ef8896a4541b1b6d5cb103eabb180fba (patch)
tree52134e653fe3b5a01167261c3b3668a85e28527e
parentcbe4b5e00edb34c3c1b4acdb800f230062eb2b47 (diff)
downloadkernel-96ebb7b6ef8896a4541b1b6d5cb103eabb180fba.tar.gz
kernel-96ebb7b6ef8896a4541b1b6d5cb103eabb180fba.tar.xz
kernel-96ebb7b6ef8896a4541b1b6d5cb103eabb180fba.zip
Enable ECHO driver (rhbz 749884)
-rw-r--r--config-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 5c48d02ac..37bd8f707 100644
--- a/config-generic
+++ b/config-generic
@@ -5216,7 +5216,6 @@ CONFIG_STAGING_MEDIA=y
# CONFIG_I2C_BCM2048 is not set
# CONFIG_DT3155 is not set
# CONFIG_PRISM2_USB is not set
-# CONFIG_ECHO is not set
CONFIG_USB_ATMEL=m
# CONFIG_COMEDI is not set
# CONFIG_PANEL is not set
@@ -5462,6 +5461,7 @@ CONFIG_FMC_WRITE_EEPROM=m
CONFIG_FMC_CHARDEV=m
# CONFIG_GENWQE is not set
+CONFIG_ECHO=m
CONFIG_POWERCAP=y
# CONFIG_THUNDERBOLT is not set
diff --git a/kernel.spec b/kernel.spec
index e78347500..93c20dc2a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2193,6 +2193,9 @@ fi
#
#
%changelog
+* Tue Apr 21 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable ECHO driver (rhbz 749884)
+
* Mon Apr 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git10.1
- Linux v4.0-8962-g14aa02449064
- DRM merge