summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-21 14:47:54 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-21 14:47:54 (GMT)
commitc4301c32663438afb8eac96db01944ad95c00260 (patch)
treecc0563cbcdc1c3d136444187211ee13151a28637 /drivers
parentc2661b806092d8ea2dccb7b02b65776555e0ee47 (diff)
parentd6fe5be34cf03e7db36d99c1b9d8e472ad3bdb87 (diff)
downloadlinux-c4301c32663438afb8eac96db01944ad95c00260.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky: "One patch to enable the BPF system call and three more bug fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/uprobes: fix kprobes dependency s390: wire up bpf syscall s390/mm: fixing calls of pte_unmap_unlock s390/hmcdrv: Restrict s390 HMC driver to S390 arch
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/char/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index dc24ecf..db2cb1f 100644
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -105,7 +105,7 @@ config SCLP_ASYNC
config HMC_DRV
def_tristate m
prompt "Support for file transfers from HMC drive CD/DVD-ROM"
- depends on 64BIT
+ depends on S390 && 64BIT
select CRC16
help
This option enables support for file transfers from a Hardware