diff --git a/[refs] b/[refs] index b1a52da9fa71..bd62e73463c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c59b9f92653f102856ca7802af551788c143a3a3 +refs/heads/master: 9163003236a52fd1a8ee6ca8a04f7232d001fc98 diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index f39a6f54c353..7ea06bee8b30 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -479,6 +479,9 @@ config NEED_SG_DMA_LENGTH config HAVE_DMA_ATTRS def_bool PCI +config NEED_DMA_MAP_STATE + def_bool PCI + config CHSC_SCH def_tristate m prompt "Support for CHSC subchannels"