diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-02-27 10:01:52 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-27 07:54:27 -0800 |
commit | 048cd4e51d24ebf7f3552226d03c769d6ad91658 (patch) | |
tree | 286c958b37b8934f1df0120c746a18d98d2ae009 /drivers/s390/block/dasd_eckd.c | |
parent | 500dd2370e77c9551ba298bdeeb91b02d8402199 (diff) | |
download | op-kernel-dev-048cd4e51d24ebf7f3552226d03c769d6ad91658.zip op-kernel-dev-048cd4e51d24ebf7f3552226d03c769d6ad91658.tar.gz |
compat: fix compile breakage on s390
The new is_compat_task() define for the !COMPAT case in
include/linux/compat.h conflicts with a similar define in
arch/s390/include/asm/compat.h.
This is the minimal patch which fixes the build issues.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/s390/block/dasd_eckd.c')
-rw-r--r-- | drivers/s390/block/dasd_eckd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 70880be..2617b1e 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c @@ -18,12 +18,12 @@ #include <linux/hdreg.h> /* HDIO_GETGEO */ #include <linux/bio.h> #include <linux/module.h> +#include <linux/compat.h> #include <linux/init.h> #include <asm/debug.h> #include <asm/idals.h> #include <asm/ebcdic.h> -#include <asm/compat.h> #include <asm/io.h> #include <asm/uaccess.h> #include <asm/cio.h> |