aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2018-01-23 13:58:05 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-02-02 10:47:14 +0100
commit366b77ae43c5a3bf1a367f15ec8bc16e05035f14 (patch)
tree28182db649e8f28f1a37b562fd102f270e0315e9
parentMerge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux (diff)
downloadlinux-dev-366b77ae43c5a3bf1a367f15ec8bc16e05035f14.tar.xz
linux-dev-366b77ae43c5a3bf1a367f15ec8bc16e05035f14.zip
s390/eadm: fix CONFIG_BLOCK include dependency
Commit 2a842acab109 ("block: introduce new block status code type") added blk_status_t usage to the eadm subchannel driver. However blk_status_t is unknown when included via <linux/blkdev.h> for CONFIG_BLOCK=n. Only include <linux/blk_types.h> since this is the only dependency eadm has. This fixes build failures like below: In file included from drivers/s390/cio/eadm_sch.c:24:0: ./arch/s390/include/asm/eadm.h:111:4: error: unknown type name 'blk_status_t'; did you mean 'si_status'? blk_status_t error); Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/eadm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/eadm.h b/arch/s390/include/asm/eadm.h
index eb5323161f11..bb63b2afdf6f 100644
--- a/arch/s390/include/asm/eadm.h
+++ b/arch/s390/include/asm/eadm.h
@@ -4,7 +4,7 @@
#include <linux/types.h>
#include <linux/device.h>
-#include <linux/blkdev.h>
+#include <linux/blk_types.h>
struct arqb {
u64 data;