diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-19 12:40:32 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-19 12:40:32 -0400 |
| commit | 7c202583fca7126ccd572e24f7193c9f8c21101a (patch) | |
| tree | fe4c81127f31954e640874884aa87ac7932a9067 /config-s390x | |
| parent | bface6d723949d7794c3cb5888d67319f7f6922f (diff) | |
| download | kernel-7c202583fca7126ccd572e24f7193c9f8c21101a.tar.gz kernel-7c202583fca7126ccd572e24f7193c9f8c21101a.tar.xz kernel-7c202583fca7126ccd572e24f7193c9f8c21101a.zip | |
Linux v3.17-rc5-63-gd9773ceabfaf
- Enable infiniband on s390x
Diffstat (limited to 'config-s390x')
| -rw-r--r-- | config-s390x | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/config-s390x b/config-s390x index 874f80847..fe0df614b 100644 --- a/config-s390x +++ b/config-s390x @@ -235,10 +235,30 @@ 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 is not set + +CONFIG_PCI=y +CONFIG_PCI_NR_FUNCTIONS=64 +CONFIG_PCI_NR_MSI=256 +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_SHPC=y +CONFIG_HOTPLUG_PCI_S390=y # CONFIG_NEW_LEDS is not set # CONFIG_HID is not set +# CONFIG_MTD is not set + +# CONFIG_PARPORT is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_FB is not set +# CONFIG_MFD_CORE is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_CB710_CORE is not set +# CONFIG_FCOE is not set +# CONFIG_FUSION is not set +# CONFIG_FIREWIRE is not set +# CONFIG_FIREWIRE_NOSY is not set # CONFIG_INPUT is not set # CONFIG_INPUT_JOYDEV is not set @@ -248,6 +268,8 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set +# CONFIG_GAMEPORT_EMU10K1 is not set +# CONFIG_GAMEPORT_FM801 is not set # CONFIG_SERIO is not set # CONFIG_ACCESSIBILITY is not set @@ -269,6 +291,17 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y # CONFIG_I2C_NFORCE2 is not set # CONFIG_PTP_1588_CLOCK is not set # CONFIG_PPS is not set +# CONFIG_W1 is not set +# CONFIG_HWMON is not set +# CONFIG_SSB is not set +# CONFIG_BCMA is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +# CONFIG_LCD_CLASS_DEVICE is not set +# CONFIG_LCD_PLATFORM is not set +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set +# CONFIG_MFD_RTSX_PCI is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_VX855 is not set # CONFIG_PHYLIB is not set # CONFIG_ATM_DRIVERS is not set @@ -282,4 +315,15 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y # CONFIG_FMC is not set +CONFIG_NETDEV_10000=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +CONFIG_IRQ_DOMAIN_DEBUG=y + CONFIG_CRASH=m |