diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/serial/mpsc.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/serial/mpsc.c')
| -rw-r--r-- | drivers/serial/mpsc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c index b5496c28e60b..55e113a0be03 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/serial/mpsc.c | |||
| @@ -70,6 +70,7 @@ | |||
| 70 | #include <linux/dma-mapping.h> | 70 | #include <linux/dma-mapping.h> |
| 71 | #include <linux/mv643xx.h> | 71 | #include <linux/mv643xx.h> |
| 72 | #include <linux/platform_device.h> | 72 | #include <linux/platform_device.h> |
| 73 | #include <linux/gfp.h> | ||
| 73 | 74 | ||
| 74 | #include <asm/io.h> | 75 | #include <asm/io.h> |
| 75 | #include <asm/irq.h> | 76 | #include <asm/irq.h> |