summaryrefslogtreecommitdiff
path: root/drivers/s390/block/Kconfig
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-12-19 14:37:24 +0300
committerDave Airlie <airlied@redhat.com>2017-12-19 14:37:24 +0300
commit6b7dcb536e3535444c39286333f10d06d2f44fb5 (patch)
tree6a4c1e30e5900626e506d46b100d21a2fcd59003 /drivers/s390/block/Kconfig
parenta942b3c2cddc4378482a427845d15c78eb50f4d4 (diff)
parent1291a0d5049dbc06baaaf66a9ff3f53db493b19b (diff)
downloadlinux-6b7dcb536e3535444c39286333f10d06d2f44fb5.tar.xz
BackMerge tag 'v4.15-rc4' into drm-next
Linux 4.15-rc4 Daniel requested it to fix some messy conflicts.
Diffstat (limited to 'drivers/s390/block/Kconfig')
-rw-r--r--drivers/s390/block/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index 31f014b57bfc..bc27d716aa6b 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
comment "S/390 block device drivers"
depends on S390 && BLOCK