summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-08-06 15:58:54 -0500
committerJustin M. Forbes <jforbes@redhat.com>2013-08-06 15:58:54 -0500
commit31780f9cbd54228b78a636787a75c7fe6ac70520 (patch)
tree43f98f101b3b8816f10df9a86696c012f8efe0a6
parent282ea30013787417a8ec0fe67b9ed790e547336a (diff)
downloadkernel-31780f9cbd54228b78a636787a75c7fe6ac70520.tar.gz
kernel-31780f9cbd54228b78a636787a75c7fe6ac70520.tar.xz
kernel-31780f9cbd54228b78a636787a75c7fe6ac70520.zip
update s390x config
-rw-r--r--config-s390x3
-rw-r--r--kernel.spec5
2 files changed, 7 insertions, 1 deletions
diff --git a/config-s390x b/config-s390x
index ec4fd04e..35aec886 100644
--- a/config-s390x
+++ b/config-s390x
@@ -250,6 +250,7 @@ CONFIG_EADM_SCH=m
CONFIG_SCM_BLOCK=m
CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
# CONFIG_S390_PTDUMP is not set
+# CONFIG_SCSI_UFSHCD is not set
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
# CONFIG_PCI is not set
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
@@ -271,6 +272,8 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
# CONFIG_ACCESSIBILITY is not set
# CONFIG_AUXDISPLAY is not set
+# CONFIG_PTP_1588_CLOCK is not set
+# CONFIG_PTP_1588_CLOCK_PCH is not set
# CONFIG_POWER_SUPPLY is not set
# CONFIG_STAGING is not set
# CONFIG_MEMSTICK is not set
diff --git a/kernel.spec b/kernel.spec
index 957fd798..4d4a81d9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2324,7 +2324,10 @@ fi
# and build.
%changelog
-* Mon Aug 04 2013 Justin M. Forbes <jforbes@redhat.com>
+* Tue Aug 06 2013 Justin M. Forbes <jforbes@redhat.com> 3.10.5-200
+- update s390x config [Dan HorĂ¡k]
+
+* Mon Aug 05 2013 Justin M. Forbes <jforbes@redhat.com>
- Linux v3.10.5
* Thu Aug 01 2013 Josh Boyer <jwboyer@redhat.com>