diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 16:41:28 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 16:41:28 +0100 |
| commit | e2aa4177264c1a459779d6e35fae22adf17a9232 (patch) | |
| tree | beba4b40aa90f6f033eb261cf5a5453c5957c87c /drivers/s390/char/fs3270.c | |
| parent | gpio/omap: Fix IRQ handling for SPARSE_IRQ (diff) | |
| parent | Linux 3.3-rc7 (diff) | |
| download | linux-e2aa4177264c1a459779d6e35fae22adf17a9232.tar.xz linux-e2aa4177264c1a459779d6e35fae22adf17a9232.zip | |
Merge tag 'v3.3-rc7' into gpio/next
Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches
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> |