diff options
author | 2012-02-27 10:01:52 +0100 | |
---|---|---|
committer | 2012-02-27 07:54:27 -0800 | |
commit | 048cd4e51d24ebf7f3552226d03c769d6ad91658 (patch) | |
tree | 286c958b37b8934f1df0120c746a18d98d2ae009 /drivers/s390/char/fs3270.c | |
parent | Merge tag 'stable/for-linus-fixes-3.3-rc5' of git://git.kernel.org/pub/scm/li... (diff) | |
download | linux-048cd4e51d24ebf7f3552226d03c769d6ad91658.tar.gz linux-048cd4e51d24ebf7f3552226d03c769d6ad91658.tar.bz2 linux-048cd4e51d24ebf7f3552226d03c769d6ad91658.zip |
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 @@ #include <linux/console.h> #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/compat.h> #include <linux/module.h> #include <linux/list.h> #include <linux/slab.h> |