[kernel/f18] Update s390x config

[Justin M. Forbes]

commit 07ec8863b586f50149a48c3a536215a9ced6e956
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Thu Aug 1 12:39:35 2013 -0500

    Update s390x config

 config-s390x |   36 +++++++++++++++++++++++++++++++-----
 kernel.spec  |    3 +++
 2 files changed, 34 insertions(+), 5 deletions(-)
---
diff --git a/config-s390x b/config-s390x
index 9ab57f8..ec4fd04 100644
--- a/config-s390x
+++ b/config-s390x
@@ -38,6 +38,7 @@ CONFIG_CMM=m
 CONFIG_CMM_PROC=y
 # CONFIG_NETIUCV is not set
 CONFIG_SMSGIUCV=m
+CONFIG_CRASH_DUMP=y
 
 #
 # SCSI low-level drivers
@@ -250,21 +251,35 @@ CONFIG_SCM_BLOCK=m
 CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # CONFIG_S390_PTDUMP is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
-CONFIG_PCI_NR_FUNCTIONS=64
-CONFIG_HOTPLUG_PCI=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-CONFIG_HOTPLUG_PCI_S390=m
+# CONFIG_PCI is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MCP23S08 is not set
 
+# CONFIG_NEW_LEDS is not set
+# CONFIG_HID is not set
+
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_STAGING is not set
+# CONFIG_MEMSTICK is not set
 # CONFIG_MEDIA_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_DRM is not set
 # CONFIG_SOUND is not set
 # CONFIG_DW_DMAC is not set
+# CONFIG_I2C is not set
 # CONFIG_I2C_SMBUS is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_HELPER_AUTO is not set
@@ -272,3 +287,14 @@ CONFIG_HOTPLUG_PCI_S390=m
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_NFORCE2 is not set
 
+# CONFIG_PHYLIB is not set
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_SH_ETH is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_IEEE802154_DRIVERS is not set
+
+# CONFIG_FMC is not set
diff --git a/kernel.spec b/kernel.spec
index 9098ef4..8c535e2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2365,6 +2365,9 @@ fi
 #                 ||     ||
 %changelog
 * Thu Aug 01 2013 Justin M. Forbes <jforbes at redhat.com>
+- Update s390x config
+
+* Thu Aug 01 2013 Justin M. Forbes <jforbes at redhat.com>
 - Rebase to 3.10.4
   dropped:
    debug-bad-pte-dmi.patch