diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /drivers/char/serial167.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'drivers/char/serial167.c')
| -rw-r--r-- | drivers/char/serial167.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 1ec3d5cd748f..8dfd24721a82 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | #include <linux/module.h> | 64 | #include <linux/module.h> |
| 65 | #include <linux/bitops.h> | 65 | #include <linux/bitops.h> |
| 66 | #include <linux/tty_flip.h> | 66 | #include <linux/tty_flip.h> |
| 67 | #include <linux/gfp.h> | ||
| 67 | 68 | ||
| 68 | #include <asm/system.h> | 69 | #include <asm/system.h> |
| 69 | #include <asm/io.h> | 70 | #include <asm/io.h> |