diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-02-27 04:01:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-27 10:54:27 -0500 |
| commit | 048cd4e51d24ebf7f3552226d03c769d6ad91658 (patch) | |
| tree | 286c958b37b8934f1df0120c746a18d98d2ae009 /drivers/s390/char/fs3270.c | |
| parent | 500dd2370e77c9551ba298bdeeb91b02d8402199 (diff) | |
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/char/fs3270.c')
| -rw-r--r-- | drivers/s390/char/fs3270.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index e71298158f9e..911704571b9c 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/console.h> | 11 | #include <linux/console.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 14 | #include <linux/compat.h> | ||
| 14 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 15 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 16 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |